Commit 20234a4b authored by Martin Storsjö's avatar Martin Storsjö

cosmetics: Align muxer/demuxer declarations

Also add missing trailing commas, break long codec_tag lines and
add spaces in codec_tag declarations.
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent fdf3a749
...@@ -171,5 +171,5 @@ AVOutputFormat ff_a64_muxer = { ...@@ -171,5 +171,5 @@ AVOutputFormat ff_a64_muxer = {
.video_codec = CODEC_ID_A64_MULTI, .video_codec = CODEC_ID_A64_MULTI,
.write_header = a64_write_header, .write_header = a64_write_header,
.write_packet = a64_write_packet, .write_packet = a64_write_packet,
.write_trailer = a64_write_trailer .write_trailer = a64_write_trailer,
}; };
...@@ -87,7 +87,7 @@ AVInputFormat ff_aac_demuxer = { ...@@ -87,7 +87,7 @@ AVInputFormat ff_aac_demuxer = {
.read_probe = adts_aac_probe, .read_probe = adts_aac_probe,
.read_header = adts_aac_read_header, .read_header = adts_aac_read_header,
.read_packet = ff_raw_read_partial_packet, .read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "aac", .extensions = "aac",
.raw_codec_id = CODEC_ID_AAC, .raw_codec_id = CODEC_ID_AAC,
}; };
...@@ -94,7 +94,7 @@ AVInputFormat ff_eac3_demuxer = { ...@@ -94,7 +94,7 @@ AVInputFormat ff_eac3_demuxer = {
.read_probe = eac3_probe, .read_probe = eac3_probe,
.read_header = ff_raw_audio_read_header, .read_header = ff_raw_audio_read_header,
.read_packet = ff_raw_read_partial_packet, .read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "eac3", .extensions = "eac3",
.raw_codec_id = CODEC_ID_EAC3, .raw_codec_id = CODEC_ID_EAC3,
}; };
......
...@@ -100,6 +100,6 @@ AVInputFormat ff_aea_demuxer = { ...@@ -100,6 +100,6 @@ AVInputFormat ff_aea_demuxer = {
.read_header = aea_read_header, .read_header = aea_read_header,
.read_packet = aea_read_packet, .read_packet = aea_read_packet,
.read_seek = ff_pcm_read_seek, .read_seek = ff_pcm_read_seek,
.flags= AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "aea", .extensions = "aea",
}; };
...@@ -328,5 +328,5 @@ AVInputFormat ff_aiff_demuxer = { ...@@ -328,5 +328,5 @@ AVInputFormat ff_aiff_demuxer = {
.read_header = aiff_read_header, .read_header = aiff_read_header,
.read_packet = aiff_read_packet, .read_packet = aiff_read_packet,
.read_seek = ff_pcm_read_seek, .read_seek = ff_pcm_read_seek,
.codec_tag= (const AVCodecTag* const []){ff_codec_aiff_tags, 0}, .codec_tag = (const AVCodecTag* const []){ ff_codec_aiff_tags, 0 },
}; };
...@@ -160,5 +160,5 @@ AVOutputFormat ff_aiff_muxer = { ...@@ -160,5 +160,5 @@ AVOutputFormat ff_aiff_muxer = {
.write_header = aiff_write_header, .write_header = aiff_write_header,
.write_packet = aiff_write_packet, .write_packet = aiff_write_packet,
.write_trailer = aiff_write_trailer, .write_trailer = aiff_write_trailer,
.codec_tag= (const AVCodecTag* const []){ff_codec_aiff_tags, 0}, .codec_tag = (const AVCodecTag* const []){ ff_codec_aiff_tags, 0 },
}; };
...@@ -438,5 +438,5 @@ AVInputFormat ff_ape_demuxer = { ...@@ -438,5 +438,5 @@ AVInputFormat ff_ape_demuxer = {
.read_packet = ape_read_packet, .read_packet = ape_read_packet,
.read_close = ape_read_close, .read_close = ape_read_close,
.read_seek = ape_read_seek, .read_seek = ape_read_seek,
.extensions = "ape,apl,mac" .extensions = "ape,apl,mac",
}; };
...@@ -894,7 +894,9 @@ AVOutputFormat ff_asf_muxer = { ...@@ -894,7 +894,9 @@ AVOutputFormat ff_asf_muxer = {
.write_packet = asf_write_packet, .write_packet = asf_write_packet,
.write_trailer = asf_write_trailer, .write_trailer = asf_write_trailer,
.flags = AVFMT_GLOBALHEADER, .flags = AVFMT_GLOBALHEADER,
.codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0}, .codec_tag = (const AVCodecTag* const []){
codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0
},
}; };
#endif #endif
...@@ -915,6 +917,8 @@ AVOutputFormat ff_asf_stream_muxer = { ...@@ -915,6 +917,8 @@ AVOutputFormat ff_asf_stream_muxer = {
.write_packet = asf_write_packet, .write_packet = asf_write_packet,
.write_trailer = asf_write_trailer, .write_trailer = asf_write_trailer,
.flags = AVFMT_GLOBALHEADER, .flags = AVFMT_GLOBALHEADER,
.codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0}, .codec_tag = (const AVCodecTag* const []){
codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0
},
}; };
#endif //CONFIG_ASF_STREAM_MUXER #endif //CONFIG_ASF_STREAM_MUXER
...@@ -191,7 +191,7 @@ AVInputFormat ff_au_demuxer = { ...@@ -191,7 +191,7 @@ AVInputFormat ff_au_demuxer = {
.read_header = au_read_header, .read_header = au_read_header,
.read_packet = au_read_packet, .read_packet = au_read_packet,
.read_seek = ff_pcm_read_seek, .read_seek = ff_pcm_read_seek,
.codec_tag= (const AVCodecTag* const []){codec_au_tags, 0}, .codec_tag = (const AVCodecTag* const []){ codec_au_tags, 0 },
}; };
#endif #endif
...@@ -206,6 +206,6 @@ AVOutputFormat ff_au_muxer = { ...@@ -206,6 +206,6 @@ AVOutputFormat ff_au_muxer = {
.write_header = au_write_header, .write_header = au_write_header,
.write_packet = au_write_packet, .write_packet = au_write_packet,
.write_trailer = au_write_trailer, .write_trailer = au_write_trailer,
.codec_tag= (const AVCodecTag* const []){codec_au_tags, 0}, .codec_tag = (const AVCodecTag* const []){ codec_au_tags, 0 },
}; };
#endif //CONFIG_AU_MUXER #endif //CONFIG_AU_MUXER
...@@ -654,6 +654,8 @@ AVOutputFormat ff_avi_muxer = { ...@@ -654,6 +654,8 @@ AVOutputFormat ff_avi_muxer = {
.write_header = avi_write_header, .write_header = avi_write_header,
.write_packet = avi_write_packet, .write_packet = avi_write_packet,
.write_trailer = avi_write_trailer, .write_trailer = avi_write_trailer,
.codec_tag= (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0}, .codec_tag = (const AVCodecTag* const []){
.flags= AVFMT_VARIABLE_FPS, ff_codec_bmp_tags, ff_codec_wav_tags, 0
},
.flags = AVFMT_VARIABLE_FPS,
}; };
...@@ -133,5 +133,5 @@ AVInputFormat ff_bmv_demuxer = { ...@@ -133,5 +133,5 @@ AVInputFormat ff_bmv_demuxer = {
.read_header = bmv_read_header, .read_header = bmv_read_header,
.read_packet = bmv_read_packet, .read_packet = bmv_read_packet,
.read_close = bmv_read_close, .read_close = bmv_read_close,
.extensions = "bmv" .extensions = "bmv",
}; };
...@@ -394,5 +394,5 @@ AVInputFormat ff_caf_demuxer = { ...@@ -394,5 +394,5 @@ AVInputFormat ff_caf_demuxer = {
.read_header = read_header, .read_header = read_header,
.read_packet = read_packet, .read_packet = read_packet,
.read_seek = read_seek, .read_seek = read_seek,
.codec_tag = (const AVCodecTag*[]){ff_codec_caf_tags, 0}, .codec_tag = (const AVCodecTag*[]){ ff_codec_caf_tags, 0 },
}; };
...@@ -68,5 +68,5 @@ AVInputFormat ff_cdg_demuxer = { ...@@ -68,5 +68,5 @@ AVInputFormat ff_cdg_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("CD Graphics Format"), .long_name = NULL_IF_CONFIG_SMALL("CD Graphics Format"),
.read_header = read_header, .read_header = read_header,
.read_packet = read_packet, .read_packet = read_packet,
.extensions = "cdg" .extensions = "cdg",
}; };
...@@ -71,7 +71,7 @@ AVInputFormat ff_dts_demuxer = { ...@@ -71,7 +71,7 @@ AVInputFormat ff_dts_demuxer = {
.read_probe = dts_probe, .read_probe = dts_probe,
.read_header = ff_raw_audio_read_header, .read_header = ff_raw_audio_read_header,
.read_packet = ff_raw_read_partial_packet, .read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "dts", .extensions = "dts",
.raw_codec_id = CODEC_ID_DTS, .raw_codec_id = CODEC_ID_DTS,
}; };
...@@ -155,7 +155,7 @@ AVInputFormat ff_flac_demuxer = { ...@@ -155,7 +155,7 @@ AVInputFormat ff_flac_demuxer = {
.read_probe = flac_probe, .read_probe = flac_probe,
.read_header = flac_read_header, .read_header = flac_read_header,
.read_packet = ff_raw_read_partial_packet, .read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "flac", .extensions = "flac",
.raw_codec_id = CODEC_ID_FLAC, .raw_codec_id = CODEC_ID_FLAC,
}; };
...@@ -127,5 +127,5 @@ AVOutputFormat ff_flac_muxer = { ...@@ -127,5 +127,5 @@ AVOutputFormat ff_flac_muxer = {
.write_header = flac_write_header, .write_header = flac_write_header,
.write_packet = flac_write_packet, .write_packet = flac_write_packet,
.write_trailer = flac_write_trailer, .write_trailer = flac_write_trailer,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
...@@ -484,6 +484,8 @@ AVOutputFormat ff_flv_muxer = { ...@@ -484,6 +484,8 @@ AVOutputFormat ff_flv_muxer = {
.write_header = flv_write_header, .write_header = flv_write_header,
.write_packet = flv_write_packet, .write_packet = flv_write_packet,
.write_trailer = flv_write_trailer, .write_trailer = flv_write_trailer,
.codec_tag= (const AVCodecTag* const []){flv_video_codec_ids, flv_audio_codec_ids, 0}, .codec_tag = (const AVCodecTag* const []){
.flags= AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, flv_video_codec_ids, flv_audio_codec_ids, 0
},
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
}; };
...@@ -66,7 +66,7 @@ AVInputFormat ff_ingenient_demuxer = { ...@@ -66,7 +66,7 @@ AVInputFormat ff_ingenient_demuxer = {
.priv_data_size = sizeof(FFRawVideoDemuxerContext), .priv_data_size = sizeof(FFRawVideoDemuxerContext),
.read_header = ff_raw_video_read_header, .read_header = ff_raw_video_read_header,
.read_packet = ingenient_read_packet, .read_packet = ingenient_read_packet,
.flags= AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "cgi", // FIXME .extensions = "cgi", // FIXME
.raw_codec_id = CODEC_ID_MJPEG, .raw_codec_id = CODEC_ID_MJPEG,
.priv_class = &ingenient_demuxer_class, .priv_class = &ingenient_demuxer_class,
......
...@@ -114,5 +114,5 @@ AVInputFormat ff_iv8_demuxer = { ...@@ -114,5 +114,5 @@ AVInputFormat ff_iv8_demuxer = {
.read_probe = probe, .read_probe = probe,
.read_header = read_header, .read_header = read_header,
.read_packet = read_packet, .read_packet = read_packet,
.flags= AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
}; };
...@@ -86,6 +86,6 @@ AVInputFormat ff_ivf_demuxer = { ...@@ -86,6 +86,6 @@ AVInputFormat ff_ivf_demuxer = {
.read_probe = probe, .read_probe = probe,
.read_header = read_header, .read_header = read_header,
.read_packet = read_packet, .read_packet = read_packet,
.flags= AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.codec_tag = (const AVCodecTag*[]){ff_codec_bmp_tags, 0}, .codec_tag = (const AVCodecTag*[]){ ff_codec_bmp_tags, 0 },
}; };
...@@ -1306,7 +1306,9 @@ AVOutputFormat ff_matroska_muxer = { ...@@ -1306,7 +1306,9 @@ AVOutputFormat ff_matroska_muxer = {
.write_packet = mkv_write_packet, .write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer, .write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
.codec_tag = (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0}, .codec_tag = (const AVCodecTag* const []){
ff_codec_bmp_tags, ff_codec_wav_tags, 0
},
.subtitle_codec = CODEC_ID_SSA, .subtitle_codec = CODEC_ID_SSA,
.query_codec = mkv_query_codec, .query_codec = mkv_query_codec,
}; };
...@@ -1345,6 +1347,6 @@ AVOutputFormat ff_matroska_audio_muxer = { ...@@ -1345,6 +1347,6 @@ AVOutputFormat ff_matroska_audio_muxer = {
.write_packet = mkv_write_packet, .write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer, .write_trailer = mkv_write_trailer,
.flags = AVFMT_GLOBALHEADER, .flags = AVFMT_GLOBALHEADER,
.codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0}, .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
}; };
#endif #endif
...@@ -3280,7 +3280,9 @@ AVOutputFormat ff_mov_muxer = { ...@@ -3280,7 +3280,9 @@ AVOutputFormat ff_mov_muxer = {
.write_packet = ff_mov_write_packet, .write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer, .write_trailer = mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){ff_codec_movvideo_tags, ff_codec_movaudio_tags, 0}, .codec_tag = (const AVCodecTag* const []){
ff_codec_movvideo_tags, ff_codec_movaudio_tags, 0
},
.priv_class = &mov_muxer_class, .priv_class = &mov_muxer_class,
}; };
#endif #endif
...@@ -3297,7 +3299,7 @@ AVOutputFormat ff_tgp_muxer = { ...@@ -3297,7 +3299,7 @@ AVOutputFormat ff_tgp_muxer = {
.write_packet = ff_mov_write_packet, .write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer, .write_trailer = mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0}, .codec_tag = (const AVCodecTag* const []){ codec_3gp_tags, 0 },
.priv_class = &tgp_muxer_class, .priv_class = &tgp_muxer_class,
}; };
#endif #endif
...@@ -3319,7 +3321,7 @@ AVOutputFormat ff_mp4_muxer = { ...@@ -3319,7 +3321,7 @@ AVOutputFormat ff_mp4_muxer = {
.write_packet = ff_mov_write_packet, .write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer, .write_trailer = mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0}, .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
.priv_class = &mp4_muxer_class, .priv_class = &mp4_muxer_class,
}; };
#endif #endif
...@@ -3340,7 +3342,7 @@ AVOutputFormat ff_psp_muxer = { ...@@ -3340,7 +3342,7 @@ AVOutputFormat ff_psp_muxer = {
.write_packet = ff_mov_write_packet, .write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer, .write_trailer = mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0}, .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
.priv_class = &psp_muxer_class, .priv_class = &psp_muxer_class,
}; };
#endif #endif
...@@ -3357,7 +3359,7 @@ AVOutputFormat ff_tg2_muxer = { ...@@ -3357,7 +3359,7 @@ AVOutputFormat ff_tg2_muxer = {
.write_packet = ff_mov_write_packet, .write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer, .write_trailer = mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0}, .codec_tag = (const AVCodecTag* const []){ codec_3gp_tags, 0 },
.priv_class = &tg2_muxer_class, .priv_class = &tg2_muxer_class,
}; };
#endif #endif
...@@ -3375,7 +3377,7 @@ AVOutputFormat ff_ipod_muxer = { ...@@ -3375,7 +3377,7 @@ AVOutputFormat ff_ipod_muxer = {
.write_packet = ff_mov_write_packet, .write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer, .write_trailer = mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){codec_ipod_tags, 0}, .codec_tag = (const AVCodecTag* const []){ codec_ipod_tags, 0 },
.priv_class = &ipod_muxer_class, .priv_class = &ipod_muxer_class,
}; };
#endif #endif
...@@ -3393,7 +3395,7 @@ AVOutputFormat ff_ismv_muxer = { ...@@ -3393,7 +3395,7 @@ AVOutputFormat ff_ismv_muxer = {
.write_packet = ff_mov_write_packet, .write_packet = ff_mov_write_packet,
.write_trailer = mov_write_trailer, .write_trailer = mov_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH,
.codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0}, .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 },
.priv_class = &ismv_muxer_class, .priv_class = &ismv_muxer_class,
}; };
#endif #endif
...@@ -193,6 +193,6 @@ AVInputFormat ff_mp3_demuxer = { ...@@ -193,6 +193,6 @@ AVInputFormat ff_mp3_demuxer = {
.read_probe = mp3_read_probe, .read_probe = mp3_read_probe,
.read_header = mp3_read_header, .read_header = mp3_read_header,
.read_packet = mp3_read_packet, .read_packet = mp3_read_packet,
.flags= AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "mp2,mp3,m2a", /* XXX: use probe */ .extensions = "mp2,mp3,m2a", /* XXX: use probe */
}; };
...@@ -614,5 +614,5 @@ AVInputFormat ff_mpegps_demuxer = { ...@@ -614,5 +614,5 @@ AVInputFormat ff_mpegps_demuxer = {
.read_header = mpegps_read_header, .read_header = mpegps_read_header,
.read_packet = mpegps_read_packet, .read_packet = mpegps_read_packet,
.read_timestamp = mpegps_read_dts, .read_timestamp = mpegps_read_dts,
.flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT, .flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT,
}; };
...@@ -2266,7 +2266,7 @@ AVInputFormat ff_mpegts_demuxer = { ...@@ -2266,7 +2266,7 @@ AVInputFormat ff_mpegts_demuxer = {
.read_close = mpegts_read_close, .read_close = mpegts_read_close,
.read_seek = read_seek, .read_seek = read_seek,
.read_timestamp = mpegts_get_pcr, .read_timestamp = mpegts_get_pcr,
.flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT, .flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT,
#ifdef USE_SYNCPOINT_SEARCH #ifdef USE_SYNCPOINT_SEARCH
.read_seek2 = read_seek2, .read_seek2 = read_seek2,
#endif #endif
...@@ -2281,7 +2281,7 @@ AVInputFormat ff_mpegtsraw_demuxer = { ...@@ -2281,7 +2281,7 @@ AVInputFormat ff_mpegtsraw_demuxer = {
.read_close = mpegts_read_close, .read_close = mpegts_read_close,
.read_seek = read_seek, .read_seek = read_seek,
.read_timestamp = mpegts_get_pcr, .read_timestamp = mpegts_get_pcr,
.flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT, .flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT,
#ifdef USE_SYNCPOINT_SEARCH #ifdef USE_SYNCPOINT_SEARCH
.read_seek2 = read_seek2, .read_seek2 = read_seek2,
#endif #endif
......
...@@ -130,5 +130,5 @@ AVInputFormat ff_mvi_demuxer = { ...@@ -130,5 +130,5 @@ AVInputFormat ff_mvi_demuxer = {
.priv_data_size = sizeof(MviDemuxContext), .priv_data_size = sizeof(MviDemuxContext),
.read_header = read_header, .read_header = read_header,
.read_packet = read_packet, .read_packet = read_packet,
.extensions = "mvi" .extensions = "mvi",
}; };
...@@ -246,5 +246,5 @@ AVInputFormat ff_mxg_demuxer = { ...@@ -246,5 +246,5 @@ AVInputFormat ff_mxg_demuxer = {
.read_header = mxg_read_header, .read_header = mxg_read_header,
.read_packet = mxg_read_packet, .read_packet = mxg_read_packet,
.read_close = mxg_close, .read_close = mxg_close,
.extensions = "mxg" .extensions = "mxg",
}; };
...@@ -932,6 +932,9 @@ AVInputFormat ff_nut_demuxer = { ...@@ -932,6 +932,9 @@ AVInputFormat ff_nut_demuxer = {
.read_close = nut_read_close, .read_close = nut_read_close,
.read_seek = read_seek, .read_seek = read_seek,
.extensions = "nut", .extensions = "nut",
.codec_tag = (const AVCodecTag * const []) { ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 }, .codec_tag = (const AVCodecTag * const []) {
ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags,
ff_nut_subtitle_tags, 0
},
}; };
#endif #endif
...@@ -878,5 +878,8 @@ AVOutputFormat ff_nut_muxer = { ...@@ -878,5 +878,8 @@ AVOutputFormat ff_nut_muxer = {
.write_packet = nut_write_packet, .write_packet = nut_write_packet,
.write_trailer = nut_write_trailer, .write_trailer = nut_write_trailer,
.flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS,
.codec_tag = (const AVCodecTag * const []){ ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 }, .codec_tag = (const AVCodecTag * const []){
ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags,
ff_nut_subtitle_tags, 0
},
}; };
...@@ -208,5 +208,5 @@ AVInputFormat ff_pva_demuxer = { ...@@ -208,5 +208,5 @@ AVInputFormat ff_pva_demuxer = {
.read_probe = pva_probe, .read_probe = pva_probe,
.read_header = pva_read_header, .read_header = pva_read_header,
.read_packet = pva_read_packet, .read_packet = pva_read_packet,
.read_timestamp = pva_read_timestamp .read_timestamp = pva_read_timestamp,
}; };
...@@ -180,7 +180,7 @@ AVInputFormat ff_g722_demuxer = { ...@@ -180,7 +180,7 @@ AVInputFormat ff_g722_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("raw G.722"), .long_name = NULL_IF_CONFIG_SMALL("raw G.722"),
.read_header = ff_raw_read_header, .read_header = ff_raw_read_header,
.read_packet = ff_raw_read_partial_packet, .read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "g722,722", .extensions = "g722,722",
.raw_codec_id = CODEC_ID_ADPCM_G722, .raw_codec_id = CODEC_ID_ADPCM_G722,
}; };
...@@ -192,7 +192,7 @@ AVInputFormat ff_latm_demuxer = { ...@@ -192,7 +192,7 @@ AVInputFormat ff_latm_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("raw LOAS/LATM"), .long_name = NULL_IF_CONFIG_SMALL("raw LOAS/LATM"),
.read_header = ff_raw_audio_read_header, .read_header = ff_raw_audio_read_header,
.read_packet = ff_raw_read_partial_packet, .read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "latm", .extensions = "latm",
.raw_codec_id = CODEC_ID_AAC_LATM, .raw_codec_id = CODEC_ID_AAC_LATM,
}; };
...@@ -208,7 +208,7 @@ AVInputFormat ff_mlp_demuxer = { ...@@ -208,7 +208,7 @@ AVInputFormat ff_mlp_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("raw MLP"), .long_name = NULL_IF_CONFIG_SMALL("raw MLP"),
.read_header = ff_raw_audio_read_header, .read_header = ff_raw_audio_read_header,
.read_packet = ff_raw_read_partial_packet, .read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "mlp", .extensions = "mlp",
.raw_codec_id = CODEC_ID_MLP, .raw_codec_id = CODEC_ID_MLP,
}; };
...@@ -220,7 +220,7 @@ AVInputFormat ff_truehd_demuxer = { ...@@ -220,7 +220,7 @@ AVInputFormat ff_truehd_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("raw TrueHD"), .long_name = NULL_IF_CONFIG_SMALL("raw TrueHD"),
.read_header = ff_raw_audio_read_header, .read_header = ff_raw_audio_read_header,
.read_packet = ff_raw_read_partial_packet, .read_packet = ff_raw_read_partial_packet,
.flags= AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "thd", .extensions = "thd",
.raw_codec_id = CODEC_ID_TRUEHD, .raw_codec_id = CODEC_ID_TRUEHD,
}; };
......
...@@ -41,7 +41,7 @@ AVOutputFormat ff_ac3_muxer = { ...@@ -41,7 +41,7 @@ AVOutputFormat ff_ac3_muxer = {
.audio_codec = CODEC_ID_AC3, .audio_codec = CODEC_ID_AC3,
.video_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_NONE,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -65,7 +65,7 @@ AVOutputFormat ff_dirac_muxer = { ...@@ -65,7 +65,7 @@ AVOutputFormat ff_dirac_muxer = {
.audio_codec = CODEC_ID_NONE, .audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_DIRAC, .video_codec = CODEC_ID_DIRAC,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -77,7 +77,7 @@ AVOutputFormat ff_dnxhd_muxer = { ...@@ -77,7 +77,7 @@ AVOutputFormat ff_dnxhd_muxer = {
.audio_codec = CODEC_ID_NONE, .audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_DNXHD, .video_codec = CODEC_ID_DNXHD,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -90,7 +90,7 @@ AVOutputFormat ff_dts_muxer = { ...@@ -90,7 +90,7 @@ AVOutputFormat ff_dts_muxer = {
.audio_codec = CODEC_ID_DTS, .audio_codec = CODEC_ID_DTS,
.video_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_NONE,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -103,7 +103,7 @@ AVOutputFormat ff_eac3_muxer = { ...@@ -103,7 +103,7 @@ AVOutputFormat ff_eac3_muxer = {
.audio_codec = CODEC_ID_EAC3, .audio_codec = CODEC_ID_EAC3,
.video_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_NONE,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -116,7 +116,7 @@ AVOutputFormat ff_g722_muxer = { ...@@ -116,7 +116,7 @@ AVOutputFormat ff_g722_muxer = {
.audio_codec = CODEC_ID_ADPCM_G722, .audio_codec = CODEC_ID_ADPCM_G722,
.video_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_NONE,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -129,7 +129,7 @@ AVOutputFormat ff_h261_muxer = { ...@@ -129,7 +129,7 @@ AVOutputFormat ff_h261_muxer = {
.audio_codec = CODEC_ID_NONE, .audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_H261, .video_codec = CODEC_ID_H261,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -142,7 +142,7 @@ AVOutputFormat ff_h263_muxer = { ...@@ -142,7 +142,7 @@ AVOutputFormat ff_h263_muxer = {
.audio_codec = CODEC_ID_NONE, .audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_H263, .video_codec = CODEC_ID_H263,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -154,7 +154,7 @@ AVOutputFormat ff_h264_muxer = { ...@@ -154,7 +154,7 @@ AVOutputFormat ff_h264_muxer = {
.audio_codec = CODEC_ID_NONE, .audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_H264, .video_codec = CODEC_ID_H264,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -166,7 +166,7 @@ AVOutputFormat ff_cavsvideo_muxer = { ...@@ -166,7 +166,7 @@ AVOutputFormat ff_cavsvideo_muxer = {
.audio_codec = CODEC_ID_NONE, .audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_CAVS, .video_codec = CODEC_ID_CAVS,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -178,7 +178,7 @@ AVOutputFormat ff_m4v_muxer = { ...@@ -178,7 +178,7 @@ AVOutputFormat ff_m4v_muxer = {
.audio_codec = CODEC_ID_NONE, .audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_MPEG4, .video_codec = CODEC_ID_MPEG4,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -191,7 +191,7 @@ AVOutputFormat ff_mjpeg_muxer = { ...@@ -191,7 +191,7 @@ AVOutputFormat ff_mjpeg_muxer = {
.audio_codec = CODEC_ID_NONE, .audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_MJPEG, .video_codec = CODEC_ID_MJPEG,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -203,7 +203,7 @@ AVOutputFormat ff_mlp_muxer = { ...@@ -203,7 +203,7 @@ AVOutputFormat ff_mlp_muxer = {
.audio_codec = CODEC_ID_MLP, .audio_codec = CODEC_ID_MLP,
.video_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_NONE,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -227,7 +227,7 @@ AVOutputFormat ff_truehd_muxer = { ...@@ -227,7 +227,7 @@ AVOutputFormat ff_truehd_muxer = {
.audio_codec = CODEC_ID_TRUEHD, .audio_codec = CODEC_ID_TRUEHD,
.video_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_NONE,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -240,7 +240,7 @@ AVOutputFormat ff_mpeg1video_muxer = { ...@@ -240,7 +240,7 @@ AVOutputFormat ff_mpeg1video_muxer = {
.audio_codec = CODEC_ID_NONE, .audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_MPEG1VIDEO, .video_codec = CODEC_ID_MPEG1VIDEO,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -252,7 +252,7 @@ AVOutputFormat ff_mpeg2video_muxer = { ...@@ -252,7 +252,7 @@ AVOutputFormat ff_mpeg2video_muxer = {
.audio_codec = CODEC_ID_NONE, .audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_MPEG2VIDEO, .video_codec = CODEC_ID_MPEG2VIDEO,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -264,6 +264,6 @@ AVOutputFormat ff_rawvideo_muxer = { ...@@ -264,6 +264,6 @@ AVOutputFormat ff_rawvideo_muxer = {
.audio_codec = CODEC_ID_NONE, .audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_RAWVIDEO, .video_codec = CODEC_ID_RAWVIDEO,
.write_packet = ff_raw_write_packet, .write_packet = ff_raw_write_packet,
.flags= AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
}; };
#endif #endif
...@@ -66,7 +66,7 @@ AVInputFormat ff_rawvideo_demuxer = { ...@@ -66,7 +66,7 @@ AVInputFormat ff_rawvideo_demuxer = {
.priv_data_size = sizeof(FFRawVideoDemuxerContext), .priv_data_size = sizeof(FFRawVideoDemuxerContext),
.read_header = ff_raw_read_header, .read_header = ff_raw_read_header,
.read_packet = rawvideo_read_packet, .read_packet = rawvideo_read_packet,
.flags= AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "yuv,cif,qcif,rgb", .extensions = "yuv,cif,qcif,rgb",
.raw_codec_id = CODEC_ID_RAWVIDEO, .raw_codec_id = CODEC_ID_RAWVIDEO,
.priv_class = &rawvideo_demuxer_class, .priv_class = &rawvideo_demuxer_class,
......
...@@ -471,5 +471,5 @@ AVOutputFormat ff_rm_muxer = { ...@@ -471,5 +471,5 @@ AVOutputFormat ff_rm_muxer = {
.write_header = rm_write_header, .write_header = rm_write_header,
.write_packet = rm_write_packet, .write_packet = rm_write_packet,
.write_trailer = rm_write_trailer, .write_trailer = rm_write_trailer,
.codec_tag= (const AVCodecTag* const []){ff_rm_codec_tags, 0}, .codec_tag = (const AVCodecTag* const []){ ff_rm_codec_tags, 0 },
}; };
...@@ -237,5 +237,5 @@ AVInputFormat ff_siff_demuxer = { ...@@ -237,5 +237,5 @@ AVInputFormat ff_siff_demuxer = {
.read_probe = siff_probe, .read_probe = siff_probe,
.read_header = siff_read_header, .read_header = siff_read_header,
.read_packet = siff_read_packet, .read_packet = siff_read_packet,
.extensions = "vb,son" .extensions = "vb,son",
}; };
...@@ -171,5 +171,5 @@ AVInputFormat ff_voc_demuxer = { ...@@ -171,5 +171,5 @@ AVInputFormat ff_voc_demuxer = {
.read_probe = voc_probe, .read_probe = voc_probe,
.read_header = voc_read_header, .read_header = voc_read_header,
.read_packet = voc_read_packet, .read_packet = voc_read_packet,
.codec_tag=(const AVCodecTag* const []){ff_voc_codec_tags, 0}, .codec_tag = (const AVCodecTag* const []){ ff_voc_codec_tags, 0 },
}; };
...@@ -100,5 +100,5 @@ AVOutputFormat ff_voc_muxer = { ...@@ -100,5 +100,5 @@ AVOutputFormat ff_voc_muxer = {
.write_header = voc_write_header, .write_header = voc_write_header,
.write_packet = voc_write_packet, .write_packet = voc_write_packet,
.write_trailer = voc_write_trailer, .write_trailer = voc_write_trailer,
.codec_tag=(const AVCodecTag* const []){ff_voc_codec_tags, 0}, .codec_tag = (const AVCodecTag* const []){ ff_voc_codec_tags, 0 },
}; };
...@@ -216,7 +216,7 @@ AVOutputFormat ff_wav_muxer = { ...@@ -216,7 +216,7 @@ AVOutputFormat ff_wav_muxer = {
.write_header = wav_write_header, .write_header = wav_write_header,
.write_packet = wav_write_packet, .write_packet = wav_write_packet,
.write_trailer = wav_write_trailer, .write_trailer = wav_write_trailer,
.codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0}, .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
.priv_class = &wav_muxer_class, .priv_class = &wav_muxer_class,
}; };
#endif /* CONFIG_WAV_MUXER */ #endif /* CONFIG_WAV_MUXER */
...@@ -593,8 +593,8 @@ AVInputFormat ff_wav_demuxer = { ...@@ -593,8 +593,8 @@ AVInputFormat ff_wav_demuxer = {
.read_header = wav_read_header, .read_header = wav_read_header,
.read_packet = wav_read_packet, .read_packet = wav_read_packet,
.read_seek = wav_read_seek, .read_seek = wav_read_seek,
.flags= AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0}, .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
}; };
#endif /* CONFIG_WAV_DEMUXER */ #endif /* CONFIG_WAV_DEMUXER */
...@@ -682,6 +682,6 @@ AVInputFormat ff_w64_demuxer = { ...@@ -682,6 +682,6 @@ AVInputFormat ff_w64_demuxer = {
.read_packet = wav_read_packet, .read_packet = wav_read_packet,
.read_seek = wav_read_seek, .read_seek = wav_read_seek,
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0}, .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 },
}; };
#endif /* CONFIG_W64_DEMUXER */ #endif /* CONFIG_W64_DEMUXER */
...@@ -419,6 +419,6 @@ AVInputFormat ff_yuv4mpegpipe_demuxer = { ...@@ -419,6 +419,6 @@ AVInputFormat ff_yuv4mpegpipe_demuxer = {
.read_probe = yuv4_probe, .read_probe = yuv4_probe,
.read_header = yuv4_read_header, .read_header = yuv4_read_header,
.read_packet = yuv4_read_packet, .read_packet = yuv4_read_packet,
.extensions = "y4m" .extensions = "y4m",
}; };
#endif #endif
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