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
...@@ -164,12 +164,12 @@ static int a64_write_trailer(struct AVFormatContext *s) ...@@ -164,12 +164,12 @@ static int a64_write_trailer(struct AVFormatContext *s)
} }
AVOutputFormat ff_a64_muxer = { AVOutputFormat ff_a64_muxer = {
.name = "a64", .name = "a64",
.long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"), .long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"),
.extensions = "a64, A64", .extensions = "a64, A64",
.priv_data_size = sizeof (A64Context), .priv_data_size = sizeof (A64Context),
.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,8 +94,8 @@ AVInputFormat ff_eac3_demuxer = { ...@@ -94,8 +94,8 @@ 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,
}; };
#endif #endif
...@@ -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 },
}; };
...@@ -177,7 +177,7 @@ AVInputFormat ff_amr_demuxer = { ...@@ -177,7 +177,7 @@ AVInputFormat ff_amr_demuxer = {
.read_probe = amr_probe, .read_probe = amr_probe,
.read_header = amr_read_header, .read_header = amr_read_header,
.read_packet = amr_read_packet, .read_packet = amr_read_packet,
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
}; };
#endif #endif
......
...@@ -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",
}; };
...@@ -1292,5 +1292,5 @@ AVInputFormat ff_asf_demuxer = { ...@@ -1292,5 +1292,5 @@ AVInputFormat ff_asf_demuxer = {
.read_close = asf_read_close, .read_close = asf_read_close,
.read_seek = asf_read_seek, .read_seek = asf_read_seek,
.read_timestamp = asf_read_pts, .read_timestamp = asf_read_pts,
.flags = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH, .flags = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH,
}; };
...@@ -893,8 +893,10 @@ AVOutputFormat ff_asf_muxer = { ...@@ -893,8 +893,10 @@ AVOutputFormat ff_asf_muxer = {
.write_header = asf_write_header, .write_header = asf_write_header,
.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
...@@ -914,7 +916,9 @@ AVOutputFormat ff_asf_stream_muxer = { ...@@ -914,7 +916,9 @@ AVOutputFormat ff_asf_stream_muxer = {
.write_header = asf_write_stream_header, .write_header = asf_write_stream_header,
.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",
}; };
...@@ -75,7 +75,7 @@ AVInputFormat ff_daud_demuxer = { ...@@ -75,7 +75,7 @@ AVInputFormat ff_daud_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio format"), .long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio format"),
.read_header = daud_header, .read_header = daud_header,
.read_packet = daud_packet, .read_packet = daud_packet,
.extensions = "302", .extensions = "302",
}; };
#endif #endif
......
...@@ -114,5 +114,5 @@ AVInputFormat ff_dfa_demuxer = { ...@@ -114,5 +114,5 @@ AVInputFormat ff_dfa_demuxer = {
.read_probe = dfa_probe, .read_probe = dfa_probe,
.read_header = dfa_read_header, .read_header = dfa_read_header,
.read_packet = dfa_read_packet, .read_packet = dfa_read_packet,
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
}; };
...@@ -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,
}; };
...@@ -542,6 +542,6 @@ AVInputFormat ff_dv_demuxer = { ...@@ -542,6 +542,6 @@ AVInputFormat ff_dv_demuxer = {
.read_packet = dv_read_packet, .read_packet = dv_read_packet,
.read_close = dv_read_close, .read_close = dv_read_close,
.read_seek = dv_read_seek, .read_seek = dv_read_seek,
.extensions = "dv,dif", .extensions = "dv,dif",
}; };
#endif #endif
...@@ -106,5 +106,5 @@ AVInputFormat ff_filmstrip_demuxer = { ...@@ -106,5 +106,5 @@ AVInputFormat ff_filmstrip_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,
.extensions = "flm", .extensions = "flm",
}; };
...@@ -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,
}; };
...@@ -707,10 +707,10 @@ AVInputFormat ff_flv_demuxer = { ...@@ -707,10 +707,10 @@ AVInputFormat ff_flv_demuxer = {
.read_probe = flv_probe, .read_probe = flv_probe,
.read_header = flv_read_header, .read_header = flv_read_header,
.read_packet = flv_read_packet, .read_packet = flv_read_packet,
.read_seek = flv_read_seek, .read_seek = flv_read_seek,
#if 0 #if 0
.read_seek2 = flv_read_seek2, .read_seek2 = flv_read_seek2,
#endif #endif
.read_close = flv_read_close, .read_close = flv_read_close,
.extensions = "flv", .extensions = "flv",
}; };
...@@ -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,8 +66,8 @@ AVInputFormat ff_ingenient_demuxer = { ...@@ -66,8 +66,8 @@ 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 },
}; };
...@@ -59,11 +59,11 @@ static int ivf_write_packet(AVFormatContext *s, AVPacket *pkt) ...@@ -59,11 +59,11 @@ static int ivf_write_packet(AVFormatContext *s, AVPacket *pkt)
} }
AVOutputFormat ff_ivf_muxer = { AVOutputFormat ff_ivf_muxer = {
.name = "ivf", .name = "ivf",
.long_name = NULL_IF_CONFIG_SMALL("On2 IVF"), .long_name = NULL_IF_CONFIG_SMALL("On2 IVF"),
.extensions = "ivf", .extensions = "ivf",
.audio_codec = CODEC_ID_NONE, .audio_codec = CODEC_ID_NONE,
.video_codec = CODEC_ID_VP8, .video_codec = CODEC_ID_VP8,
.write_header = ivf_write_header, .write_header = ivf_write_header,
.write_packet = ivf_write_packet, .write_packet = ivf_write_packet,
}; };
...@@ -162,7 +162,7 @@ AVOutputFormat ff_libnut_muxer = { ...@@ -162,7 +162,7 @@ AVOutputFormat ff_libnut_muxer = {
.write_header = nut_write_header, .write_header = nut_write_header,
.write_packet = nut_write_packet, .write_packet = nut_write_packet,
.write_trailer = nut_write_trailer, .write_trailer = nut_write_trailer,
.flags = AVFMT_GLOBALHEADER, .flags = AVFMT_GLOBALHEADER,
}; };
#endif /* CONFIG_LIBNUT_MUXER */ #endif /* CONFIG_LIBNUT_MUXER */
...@@ -307,5 +307,5 @@ AVInputFormat ff_libnut_demuxer = { ...@@ -307,5 +307,5 @@ AVInputFormat ff_libnut_demuxer = {
.read_packet = nut_read_packet, .read_packet = nut_read_packet,
.read_close = nut_read_close, .read_close = nut_read_close,
.read_seek = nut_read_seek, .read_seek = nut_read_seek,
.extensions = "nut", .extensions = "nut",
}; };
...@@ -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,
}; };
...@@ -1324,7 +1326,7 @@ AVOutputFormat ff_webm_muxer = { ...@@ -1324,7 +1326,7 @@ AVOutputFormat ff_webm_muxer = {
.write_header = mkv_write_header, .write_header = mkv_write_header,
.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,
}; };
#endif #endif
...@@ -1344,7 +1346,7 @@ AVOutputFormat ff_matroska_audio_muxer = { ...@@ -1344,7 +1346,7 @@ AVOutputFormat ff_matroska_audio_muxer = {
.write_header = mkv_write_header, .write_header = mkv_write_header,
.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
...@@ -3279,9 +3279,11 @@ AVOutputFormat ff_mov_muxer = { ...@@ -3279,9 +3279,11 @@ AVOutputFormat ff_mov_muxer = {
.write_header = mov_write_header, .write_header = mov_write_header,
.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 []){
.priv_class = &mov_muxer_class, ff_codec_movvideo_tags, ff_codec_movaudio_tags, 0
},
.priv_class = &mov_muxer_class,
}; };
#endif #endif
#if CONFIG_TGP_MUXER #if CONFIG_TGP_MUXER
...@@ -3296,9 +3298,9 @@ AVOutputFormat ff_tgp_muxer = { ...@@ -3296,9 +3298,9 @@ AVOutputFormat ff_tgp_muxer = {
.write_header = mov_write_header, .write_header = mov_write_header,
.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
#if CONFIG_MP4_MUXER #if CONFIG_MP4_MUXER
...@@ -3318,9 +3320,9 @@ AVOutputFormat ff_mp4_muxer = { ...@@ -3318,9 +3320,9 @@ AVOutputFormat ff_mp4_muxer = {
.write_header = mov_write_header, .write_header = mov_write_header,
.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
#if CONFIG_PSP_MUXER #if CONFIG_PSP_MUXER
...@@ -3339,9 +3341,9 @@ AVOutputFormat ff_psp_muxer = { ...@@ -3339,9 +3341,9 @@ AVOutputFormat ff_psp_muxer = {
.write_header = mov_write_header, .write_header = mov_write_header,
.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
#if CONFIG_TG2_MUXER #if CONFIG_TG2_MUXER
...@@ -3356,9 +3358,9 @@ AVOutputFormat ff_tg2_muxer = { ...@@ -3356,9 +3358,9 @@ AVOutputFormat ff_tg2_muxer = {
.write_header = mov_write_header, .write_header = mov_write_header,
.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
#if CONFIG_IPOD_MUXER #if CONFIG_IPOD_MUXER
...@@ -3374,9 +3376,9 @@ AVOutputFormat ff_ipod_muxer = { ...@@ -3374,9 +3376,9 @@ AVOutputFormat ff_ipod_muxer = {
.write_header = mov_write_header, .write_header = mov_write_header,
.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
#if CONFIG_ISMV_MUXER #if CONFIG_ISMV_MUXER
...@@ -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 */
}; };
...@@ -319,6 +319,6 @@ AVOutputFormat ff_mp3_muxer = { ...@@ -319,6 +319,6 @@ AVOutputFormat ff_mp3_muxer = {
.write_packet = mp3_write_packet, .write_packet = mp3_write_packet,
.write_trailer = mp3_write_trailer, .write_trailer = mp3_write_trailer,
.flags = AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
.priv_class = &mp3_muxer_class, .priv_class = &mp3_muxer_class,
}; };
#endif #endif
...@@ -231,5 +231,5 @@ AVInputFormat ff_mpc_demuxer = { ...@@ -231,5 +231,5 @@ AVInputFormat ff_mpc_demuxer = {
.read_packet = mpc_read_packet, .read_packet = mpc_read_packet,
.read_close = mpc_read_close, .read_close = mpc_read_close,
.read_seek = mpc_read_seek, .read_seek = mpc_read_seek,
.extensions = "mpc", .extensions = "mpc",
}; };
...@@ -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,9 +2266,9 @@ AVInputFormat ff_mpegts_demuxer = { ...@@ -2266,9 +2266,9 @@ 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,9 +2281,9 @@ AVInputFormat ff_mpegtsraw_demuxer = { ...@@ -2281,9 +2281,9 @@ 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
.priv_class = &mpegtsraw_class, .priv_class = &mpegtsraw_class,
}; };
...@@ -1125,5 +1125,5 @@ AVOutputFormat ff_mpegts_muxer = { ...@@ -1125,5 +1125,5 @@ AVOutputFormat ff_mpegts_muxer = {
.write_packet = mpegts_write_packet, .write_packet = mpegts_write_packet,
.write_trailer = mpegts_write_end, .write_trailer = mpegts_write_end,
.flags = AVFMT_ALLOW_FLUSH, .flags = AVFMT_ALLOW_FLUSH,
.priv_class = &mpegts_muxer_class, .priv_class = &mpegts_muxer_class,
}; };
...@@ -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",
}; };
...@@ -240,11 +240,11 @@ static int mxg_close(struct AVFormatContext *s) ...@@ -240,11 +240,11 @@ static int mxg_close(struct AVFormatContext *s)
} }
AVInputFormat ff_mxg_demuxer = { AVInputFormat ff_mxg_demuxer = {
.name = "mxg", .name = "mxg",
.long_name = NULL_IF_CONFIG_SMALL("MxPEG clip file format"), .long_name = NULL_IF_CONFIG_SMALL("MxPEG clip file format"),
.priv_data_size = sizeof(MXGContext), .priv_data_size = sizeof(MXGContext),
.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",
}; };
...@@ -97,5 +97,5 @@ AVInputFormat ff_nc_demuxer = { ...@@ -97,5 +97,5 @@ AVInputFormat ff_nc_demuxer = {
.read_probe = nc_probe, .read_probe = nc_probe,
.read_header = nc_read_header, .read_header = nc_read_header,
.read_packet = nc_read_packet, .read_packet = nc_read_packet,
.extensions = "v", .extensions = "v",
}; };
...@@ -32,5 +32,5 @@ AVOutputFormat ff_null_muxer = { ...@@ -32,5 +32,5 @@ AVOutputFormat ff_null_muxer = {
.audio_codec = AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE), .audio_codec = AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE),
.video_codec = CODEC_ID_RAWVIDEO, .video_codec = CODEC_ID_RAWVIDEO,
.write_packet = null_write_packet, .write_packet = null_write_packet,
.flags = AVFMT_NOFILE | AVFMT_NOTIMESTAMPS | AVFMT_RAWPICTURE, .flags = AVFMT_NOFILE | AVFMT_NOTIMESTAMPS | AVFMT_RAWPICTURE,
}; };
...@@ -931,7 +931,10 @@ AVInputFormat ff_nut_demuxer = { ...@@ -931,7 +931,10 @@ AVInputFormat ff_nut_demuxer = {
.read_packet = nut_read_packet, .read_packet = nut_read_packet,
.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
...@@ -877,6 +877,9 @@ AVOutputFormat ff_nut_muxer = { ...@@ -877,6 +877,9 @@ AVOutputFormat ff_nut_muxer = {
.write_header = nut_write_header, .write_header = nut_write_header,
.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
},
}; };
...@@ -266,5 +266,5 @@ AVInputFormat ff_nuv_demuxer = { ...@@ -266,5 +266,5 @@ AVInputFormat ff_nuv_demuxer = {
.read_probe = nuv_probe, .read_probe = nuv_probe,
.read_header = nuv_header, .read_header = nuv_header,
.read_packet = nuv_packet, .read_packet = nuv_packet,
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
}; };
...@@ -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,8 +180,8 @@ AVInputFormat ff_g722_demuxer = { ...@@ -180,8 +180,8 @@ 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,
}; };
#endif #endif
...@@ -192,8 +192,8 @@ AVInputFormat ff_latm_demuxer = { ...@@ -192,8 +192,8 @@ 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,
}; };
#endif #endif
...@@ -208,8 +208,8 @@ AVInputFormat ff_mlp_demuxer = { ...@@ -208,8 +208,8 @@ 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,
}; };
#endif #endif
...@@ -220,8 +220,8 @@ AVInputFormat ff_truehd_demuxer = { ...@@ -220,8 +220,8 @@ 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,
}; };
#endif #endif
...@@ -233,7 +233,7 @@ AVInputFormat ff_shorten_demuxer = { ...@@ -233,7 +233,7 @@ AVInputFormat ff_shorten_demuxer = {
.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_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK, .flags = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK,
.extensions = "shn", .extensions = "shn",
.raw_codec_id = CODEC_ID_SHORTEN, .raw_codec_id = CODEC_ID_SHORTEN,
}; };
#endif #endif
......
...@@ -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,8 +66,8 @@ AVInputFormat ff_rawvideo_demuxer = { ...@@ -66,8 +66,8 @@ 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 },
}; };
...@@ -503,5 +503,5 @@ AVOutputFormat ff_rtp_muxer = { ...@@ -503,5 +503,5 @@ AVOutputFormat ff_rtp_muxer = {
.write_header = rtp_write_header, .write_header = rtp_write_header,
.write_packet = rtp_write_packet, .write_packet = rtp_write_packet,
.write_trailer = rtp_write_trailer, .write_trailer = rtp_write_trailer,
.priv_class = &rtp_muxer_class, .priv_class = &rtp_muxer_class,
}; };
...@@ -234,5 +234,5 @@ AVInputFormat ff_sap_demuxer = { ...@@ -234,5 +234,5 @@ AVInputFormat ff_sap_demuxer = {
.read_header = sap_read_header, .read_header = sap_read_header,
.read_packet = sap_fetch_packet, .read_packet = sap_fetch_packet,
.read_close = sap_read_close, .read_close = sap_read_close,
.flags = AVFMT_NOFILE, .flags = AVFMT_NOFILE,
}; };
...@@ -258,5 +258,5 @@ AVOutputFormat ff_sap_muxer = { ...@@ -258,5 +258,5 @@ AVOutputFormat ff_sap_muxer = {
.write_header = sap_write_header, .write_header = sap_write_header,
.write_packet = sap_write_packet, .write_packet = sap_write_packet,
.write_trailer = sap_write_close, .write_trailer = sap_write_close,
.flags = AVFMT_NOFILE | AVFMT_GLOBALHEADER, .flags = AVFMT_NOFILE | AVFMT_GLOBALHEADER,
}; };
...@@ -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",
}; };
...@@ -231,5 +231,5 @@ AVInputFormat ff_spdif_demuxer = { ...@@ -231,5 +231,5 @@ AVInputFormat ff_spdif_demuxer = {
.read_probe = spdif_probe, .read_probe = spdif_probe,
.read_header = spdif_read_header, .read_header = spdif_read_header,
.read_packet = spdif_read_packet, .read_packet = spdif_read_packet,
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
}; };
...@@ -553,6 +553,6 @@ AVOutputFormat ff_spdif_muxer = { ...@@ -553,6 +553,6 @@ AVOutputFormat ff_spdif_muxer = {
.write_header = spdif_write_header, .write_header = spdif_write_header,
.write_packet = spdif_write_packet, .write_packet = spdif_write_packet,
.write_trailer = spdif_write_trailer, .write_trailer = spdif_write_trailer,
.flags = AVFMT_NOTIMESTAMPS, .flags = AVFMT_NOTIMESTAMPS,
.priv_class = &class, .priv_class = &class,
}; };
...@@ -188,5 +188,5 @@ AVInputFormat ff_tmv_demuxer = { ...@@ -188,5 +188,5 @@ AVInputFormat ff_tmv_demuxer = {
.read_header = tmv_read_header, .read_header = tmv_read_header,
.read_packet = tmv_read_packet, .read_packet = tmv_read_packet,
.read_seek = tmv_read_seek, .read_seek = tmv_read_seek,
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
}; };
...@@ -166,5 +166,5 @@ AVInputFormat ff_tta_demuxer = { ...@@ -166,5 +166,5 @@ AVInputFormat ff_tta_demuxer = {
.read_header = tta_read_header, .read_header = tta_read_header,
.read_packet = tta_read_packet, .read_packet = tta_read_packet,
.read_seek = tta_read_seek, .read_seek = tta_read_seek,
.extensions = "tta", .extensions = "tta",
}; };
...@@ -115,5 +115,5 @@ AVInputFormat ff_vc1t_demuxer = { ...@@ -115,5 +115,5 @@ AVInputFormat ff_vc1t_demuxer = {
.read_probe = vc1t_probe, .read_probe = vc1t_probe,
.read_header = vc1t_read_header, .read_header = vc1t_read_header,
.read_packet = vc1t_read_packet, .read_packet = vc1t_read_packet,
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
}; };
...@@ -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,8 +216,8 @@ AVOutputFormat ff_wav_muxer = { ...@@ -216,8 +216,8 @@ 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 */
...@@ -681,7 +681,7 @@ AVInputFormat ff_w64_demuxer = { ...@@ -681,7 +681,7 @@ AVInputFormat ff_w64_demuxer = {
.read_header = w64_read_header, .read_header = w64_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_W64_DEMUXER */ #endif /* CONFIG_W64_DEMUXER */
...@@ -213,6 +213,6 @@ AVInputFormat ff_yop_demuxer = { ...@@ -213,6 +213,6 @@ AVInputFormat ff_yop_demuxer = {
.read_packet = yop_read_packet, .read_packet = yop_read_packet,
.read_close = yop_read_close, .read_close = yop_read_close,
.read_seek = yop_read_seek, .read_seek = yop_read_seek,
.extensions = "yop", .extensions = "yop",
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
}; };
...@@ -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