Commit f326a014 authored by michaelni's avatar michaelni

c syntax update patch by (mru at users dot sourceforge dot net (Måns Rullgård))


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@1008 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent b1fe77fa
...@@ -280,7 +280,7 @@ AVInputFormat audio_in_format = { ...@@ -280,7 +280,7 @@ AVInputFormat audio_in_format = {
audio_read_header, audio_read_header,
audio_read_packet, audio_read_packet,
audio_read_close, audio_read_close,
flags: AVFMT_NOFILE, .flags = AVFMT_NOFILE,
}; };
AVOutputFormat audio_out_format = { AVOutputFormat audio_out_format = {
...@@ -301,7 +301,7 @@ AVOutputFormat audio_out_format = { ...@@ -301,7 +301,7 @@ AVOutputFormat audio_out_format = {
audio_write_header, audio_write_header,
audio_write_packet, audio_write_packet,
audio_write_trailer, audio_write_trailer,
flags: AVFMT_NOFILE, .flags = AVFMT_NOFILE,
}; };
int audio_init(void) int audio_init(void)
......
...@@ -320,7 +320,7 @@ AVInputFormat video_grab_device_format = { ...@@ -320,7 +320,7 @@ AVInputFormat video_grab_device_format = {
grab_read_header, grab_read_header,
grab_read_packet, grab_read_packet,
grab_read_close, grab_read_close,
flags: AVFMT_NOFILE, .flags = AVFMT_NOFILE,
}; };
int video_grab_init(void) int video_grab_init(void)
......
...@@ -729,7 +729,7 @@ AVInputFormat pgm_iformat = { ...@@ -729,7 +729,7 @@ AVInputFormat pgm_iformat = {
img_read_close, img_read_close,
NULL, NULL,
AVFMT_NOFILE | AVFMT_NEEDNUMBER, AVFMT_NOFILE | AVFMT_NEEDNUMBER,
extensions: "pgm", .extensions = "pgm",
}; };
AVOutputFormat pgm_oformat = { AVOutputFormat pgm_oformat = {
...@@ -782,7 +782,7 @@ AVInputFormat ppm_iformat = { ...@@ -782,7 +782,7 @@ AVInputFormat ppm_iformat = {
img_read_close, img_read_close,
NULL, NULL,
AVFMT_NOFILE | AVFMT_NEEDNUMBER | AVFMT_RGB24, AVFMT_NOFILE | AVFMT_NEEDNUMBER | AVFMT_RGB24,
extensions: "ppm", .extensions = "ppm",
}; };
AVOutputFormat ppm_oformat = { AVOutputFormat ppm_oformat = {
...@@ -809,7 +809,7 @@ AVInputFormat imgyuv_iformat = { ...@@ -809,7 +809,7 @@ AVInputFormat imgyuv_iformat = {
img_read_close, img_read_close,
NULL, NULL,
AVFMT_NOFILE | AVFMT_NEEDNUMBER, AVFMT_NOFILE | AVFMT_NEEDNUMBER,
extensions: "Y", .extensions = "Y",
}; };
AVOutputFormat imgyuv_oformat = { AVOutputFormat imgyuv_oformat = {
...@@ -883,7 +883,7 @@ AVInputFormat ppmpipe_iformat = { ...@@ -883,7 +883,7 @@ AVInputFormat ppmpipe_iformat = {
img_read_packet, img_read_packet,
img_read_close, img_read_close,
NULL, NULL,
flags: AVFMT_RGB24, .flags = AVFMT_RGB24,
}; };
AVOutputFormat ppmpipe_oformat = { AVOutputFormat ppmpipe_oformat = {
...@@ -897,7 +897,7 @@ AVOutputFormat ppmpipe_oformat = { ...@@ -897,7 +897,7 @@ AVOutputFormat ppmpipe_oformat = {
img_write_header, img_write_header,
img_write_packet, img_write_packet,
img_write_trailer, img_write_trailer,
flags: AVFMT_RGB24, .flags = AVFMT_RGB24,
}; };
......
...@@ -238,8 +238,8 @@ static AVInputFormat jpeg_iformat = { ...@@ -238,8 +238,8 @@ static AVInputFormat jpeg_iformat = {
jpeg_read_packet, jpeg_read_packet,
jpeg_read_close, jpeg_read_close,
NULL, NULL,
flags: AVFMT_NOFILE | AVFMT_NEEDNUMBER, .flags = AVFMT_NOFILE | AVFMT_NEEDNUMBER,
extensions: "jpg,jpeg", .extensions = "jpg,jpeg",
}; };
static AVOutputFormat jpeg_oformat = { static AVOutputFormat jpeg_oformat = {
...@@ -253,7 +253,7 @@ static AVOutputFormat jpeg_oformat = { ...@@ -253,7 +253,7 @@ static AVOutputFormat jpeg_oformat = {
jpeg_write_header, jpeg_write_header,
jpeg_write_packet, jpeg_write_packet,
jpeg_write_trailer, jpeg_write_trailer,
flags: AVFMT_NOFILE | AVFMT_NEEDNUMBER, .flags = AVFMT_NOFILE | AVFMT_NEEDNUMBER,
}; };
int jpeg_init(void) int jpeg_init(void)
......
...@@ -647,7 +647,7 @@ static AVInputFormat mpegps_demux = { ...@@ -647,7 +647,7 @@ static AVInputFormat mpegps_demux = {
mpegps_read_header, mpegps_read_header,
mpegps_read_packet, mpegps_read_packet,
mpegps_read_close, mpegps_read_close,
flags: AVFMT_NOHEADER, .flags = AVFMT_NOHEADER,
}; };
int mpegps_init(void) int mpegps_init(void)
......
...@@ -306,7 +306,7 @@ AVInputFormat mpegts_demux = { ...@@ -306,7 +306,7 @@ AVInputFormat mpegts_demux = {
mpegts_read_header, mpegts_read_header,
mpegts_read_packet, mpegts_read_packet,
mpegts_read_close, mpegts_read_close,
flags: AVFMT_NOHEADER | AVFMT_SHOW_IDS, .flags = AVFMT_NOHEADER | AVFMT_SHOW_IDS,
}; };
int mpegts_init(void) int mpegts_init(void)
......
...@@ -185,7 +185,7 @@ AVInputFormat mp3_iformat = { ...@@ -185,7 +185,7 @@ AVInputFormat mp3_iformat = {
mp3_read_header, mp3_read_header,
raw_read_packet, raw_read_packet,
raw_read_close, raw_read_close,
extensions: "mp2,mp3", /* XXX: use probe */ .extensions = "mp2,mp3", /* XXX: use probe */
}; };
AVOutputFormat mp2_oformat = { AVOutputFormat mp2_oformat = {
...@@ -210,8 +210,8 @@ AVInputFormat ac3_iformat = { ...@@ -210,8 +210,8 @@ AVInputFormat ac3_iformat = {
raw_read_header, raw_read_header,
raw_read_packet, raw_read_packet,
raw_read_close, raw_read_close,
extensions: "ac3", .extensions = "ac3",
value: CODEC_ID_AC3, .value = CODEC_ID_AC3,
}; };
AVOutputFormat ac3_oformat = { AVOutputFormat ac3_oformat = {
...@@ -248,8 +248,8 @@ AVInputFormat m4v_iformat = { ...@@ -248,8 +248,8 @@ AVInputFormat m4v_iformat = {
video_read_header, video_read_header,
raw_read_packet, raw_read_packet,
raw_read_close, raw_read_close,
extensions: "m4v", //FIXME remove after writing mpeg4_probe .extensions = "m4v", //FIXME remove after writing mpeg4_probe
value: CODEC_ID_MPEG4, .value = CODEC_ID_MPEG4,
}; };
AVOutputFormat m4v_oformat = { AVOutputFormat m4v_oformat = {
...@@ -273,7 +273,7 @@ AVInputFormat mpegvideo_iformat = { ...@@ -273,7 +273,7 @@ AVInputFormat mpegvideo_iformat = {
video_read_header, video_read_header,
raw_read_packet, raw_read_packet,
raw_read_close, raw_read_close,
value: CODEC_ID_MPEG1VIDEO, .value = CODEC_ID_MPEG1VIDEO,
}; };
AVOutputFormat mpeg1video_oformat = { AVOutputFormat mpeg1video_oformat = {
...@@ -297,8 +297,8 @@ AVInputFormat mjpeg_iformat = { ...@@ -297,8 +297,8 @@ AVInputFormat mjpeg_iformat = {
video_read_header, video_read_header,
raw_read_packet, raw_read_packet,
raw_read_close, raw_read_close,
extensions: "mjpg,mjpeg", .extensions = "mjpg,mjpeg",
value: CODEC_ID_MJPEG, .value = CODEC_ID_MJPEG,
}; };
AVOutputFormat mjpeg_oformat = { AVOutputFormat mjpeg_oformat = {
...@@ -325,8 +325,8 @@ AVInputFormat pcm_ ## name ## _iformat = {\ ...@@ -325,8 +325,8 @@ AVInputFormat pcm_ ## name ## _iformat = {\
raw_read_header,\ raw_read_header,\
raw_read_packet,\ raw_read_packet,\
raw_read_close,\ raw_read_close,\
extensions: ext,\ .extensions = ext,\
value: codec,\ .value = codec,\
};\ };\
\ \
AVOutputFormat pcm_ ## name ## _oformat = {\ AVOutputFormat pcm_ ## name ## _oformat = {\
...@@ -426,8 +426,8 @@ AVInputFormat rawvideo_iformat = { ...@@ -426,8 +426,8 @@ AVInputFormat rawvideo_iformat = {
raw_read_header, raw_read_header,
rawvideo_read_packet, rawvideo_read_packet,
raw_read_close, raw_read_close,
extensions: "yuv", .extensions = "yuv",
value: CODEC_ID_RAWVIDEO, .value = CODEC_ID_RAWVIDEO,
}; };
AVOutputFormat rawvideo_oformat = { AVOutputFormat rawvideo_oformat = {
......
...@@ -630,7 +630,7 @@ AVInputFormat rtp_demux = { ...@@ -630,7 +630,7 @@ AVInputFormat rtp_demux = {
rtp_read_header, rtp_read_header,
rtp_read_packet, rtp_read_packet,
rtp_read_close, rtp_read_close,
flags: AVFMT_NOHEADER, .flags = AVFMT_NOHEADER,
}; };
AVOutputFormat rtp_mux = { AVOutputFormat rtp_mux = {
......
...@@ -818,7 +818,7 @@ static AVInputFormat rtsp_demux = { ...@@ -818,7 +818,7 @@ static AVInputFormat rtsp_demux = {
rtsp_read_header, rtsp_read_header,
rtsp_read_packet, rtsp_read_packet,
rtsp_read_close, rtsp_read_close,
flags: AVFMT_NOFILE, .flags = AVFMT_NOFILE,
}; };
/* dummy redirector format (used directly in av_open_input_file now) */ /* dummy redirector format (used directly in av_open_input_file now) */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment