From 5cc51a5847ca9f333672370b1aa98e2d9f9518aa Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Wed, 21 Mar 2012 20:36:51 -0400 Subject: [PATCH 1/4] avutil: Add av_get_default_channel_layout() Also, use the new function in the AC-3 encoder. --- doc/APIchanges | 3 +++ libavcodec/ac3enc.c | 2 +- libavutil/audioconvert.c | 15 +++++++++++++++ libavutil/audioconvert.h | 5 +++++ libavutil/avutil.h | 2 +- 5 files changed, 25 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 15eec4067a..80bea4fd51 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -12,6 +12,9 @@ libavutil: 2011-04-18 API changes, most recent first: +2012-xx-xx - xxxxxxx - lavu 51.26.0 - audioconvert.h + Add av_get_default_channel_layout() + 2012-03-06 - 4d851f8 - lavu 51.25.0 - cpu.h Add av_set_cpu_flags_mask(). diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c index c903b724d5..3962fab748 100644 --- a/libavcodec/ac3enc.c +++ b/libavcodec/ac3enc.c @@ -2074,7 +2074,7 @@ static av_cold int set_channel_info(AC3EncodeContext *s, int channels, return AVERROR(EINVAL); ch_layout = *channel_layout; if (!ch_layout) - ch_layout = avcodec_guess_channel_layout(channels, CODEC_ID_AC3, NULL); + ch_layout = av_get_default_channel_layout(channels); s->lfe_on = !!(ch_layout & AV_CH_LOW_FREQUENCY); s->channels = channels; diff --git a/libavutil/audioconvert.c b/libavutil/audioconvert.c index 0a83b05ad9..85c20e2868 100644 --- a/libavutil/audioconvert.c +++ b/libavutil/audioconvert.c @@ -153,3 +153,18 @@ int av_get_channel_layout_nb_channels(uint64_t channel_layout) x &= x-1; // unset lowest set bit return count; } + +uint64_t av_get_default_channel_layout(int nb_channels) +{ + switch(nb_channels) { + case 1: return AV_CH_LAYOUT_MONO; + case 2: return AV_CH_LAYOUT_STEREO; + case 3: return AV_CH_LAYOUT_SURROUND; + case 4: return AV_CH_LAYOUT_QUAD; + case 5: return AV_CH_LAYOUT_5POINT0; + case 6: return AV_CH_LAYOUT_5POINT1; + case 7: return AV_CH_LAYOUT_6POINT1; + case 8: return AV_CH_LAYOUT_7POINT1; + default: return 0; + } +} diff --git a/libavutil/audioconvert.h b/libavutil/audioconvert.h index 55d79fc97e..2b0c9cdea9 100644 --- a/libavutil/audioconvert.h +++ b/libavutil/audioconvert.h @@ -124,6 +124,11 @@ void av_get_channel_layout_string(char *buf, int buf_size, int nb_channels, uint */ int av_get_channel_layout_nb_channels(uint64_t channel_layout); +/** + * Return default channel layout for a given number of channels. + */ +uint64_t av_get_default_channel_layout(int nb_channels); + /** * @} */ diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 21fc737114..6ab4840ede 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -152,7 +152,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 25 +#define LIBAVUTIL_VERSION_MINOR 26 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ From bb0618e68b31db3ee8b572a39c2bb98d64338d52 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Wed, 21 Mar 2012 20:39:02 -0400 Subject: [PATCH 2/4] avcodec: remove avcodec_guess_channel_layout() It is not public because the header is not installed, and its functionality has been replaced by av_get_default_channel_layout(). --- libavcodec/audioconvert.c | 14 -------------- libavcodec/audioconvert.h | 9 --------- 2 files changed, 23 deletions(-) diff --git a/libavcodec/audioconvert.c b/libavcodec/audioconvert.c index 0e1160d8e3..112e22096b 100644 --- a/libavcodec/audioconvert.c +++ b/libavcodec/audioconvert.c @@ -31,20 +31,6 @@ #include "avcodec.h" #include "audioconvert.h" -uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name) -{ - switch(nb_channels) { - case 1: return AV_CH_LAYOUT_MONO; - case 2: return AV_CH_LAYOUT_STEREO; - case 3: return AV_CH_LAYOUT_SURROUND; - case 4: return AV_CH_LAYOUT_QUAD; - case 5: return AV_CH_LAYOUT_5POINT0; - case 6: return AV_CH_LAYOUT_5POINT1; - case 8: return AV_CH_LAYOUT_7POINT1; - default: return 0; - } -} - struct AVAudioConvert { int in_channels, out_channels; int fmt_pair; diff --git a/libavcodec/audioconvert.h b/libavcodec/audioconvert.h index 590dc8d8d7..a7b0baa828 100644 --- a/libavcodec/audioconvert.h +++ b/libavcodec/audioconvert.h @@ -33,15 +33,6 @@ #include "avcodec.h" #include "libavutil/audioconvert.h" -/** - * Guess the channel layout - * @param nb_channels - * @param codec_id Codec identifier, or CODEC_ID_NONE if unknown - * @param fmt_name Format name, or NULL if unknown - * @return Channel layout mask - */ -uint64_t avcodec_guess_channel_layout(int nb_channels, enum CodecID codec_id, const char *fmt_name); - struct AVAudioConvert; typedef struct AVAudioConvert AVAudioConvert; From fdf3a749d3b767d3569b7a19b1f4cf7e411ee2c0 Mon Sep 17 00:00:00 2001 From: Anne Aaron Date: Wed, 4 Apr 2012 11:36:00 -0700 Subject: [PATCH 3/4] mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Martin Storsjö --- libavcodec/mpeg12.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c index c49343f4b2..966f2e13fe 100644 --- a/libavcodec/mpeg12.c +++ b/libavcodec/mpeg12.c @@ -1521,8 +1521,7 @@ static void mpeg_decode_picture_coding_extension(Mpeg1Context *s1) } if (s->progressive_sequence && !s->frame_pred_frame_dct) { - av_log(s->avctx, AV_LOG_ERROR, "invalid frame_pred_frame_dct\n"); - s->frame_pred_frame_dct = 1; + av_log(s->avctx, AV_LOG_WARNING, "invalid frame_pred_frame_dct\n"); } if (s->picture_structure == PICT_FRAME) { From 20234a4bd7e187ae31f9a66b5c40e98666bc30e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Fri, 6 Apr 2012 17:50:48 +0300 Subject: [PATCH 4/4] cosmetics: Align muxer/demuxer declarations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also add missing trailing commas, break long codec_tag lines and add spaces in codec_tag declarations. Signed-off-by: Martin Storsjö --- libavformat/a64.c | 14 ++++++------- libavformat/aacdec.c | 4 ++-- libavformat/ac3dec.c | 4 ++-- libavformat/aea.c | 4 ++-- libavformat/aiffdec.c | 2 +- libavformat/aiffenc.c | 2 +- libavformat/amr.c | 2 +- libavformat/ape.c | 2 +- libavformat/asfdec.c | 2 +- libavformat/asfenc.c | 12 ++++++++---- libavformat/au.c | 4 ++-- libavformat/avienc.c | 6 ++++-- libavformat/bmv.c | 2 +- libavformat/cafdec.c | 2 +- libavformat/cdg.c | 2 +- libavformat/daud.c | 2 +- libavformat/dfa.c | 2 +- libavformat/dtsdec.c | 4 ++-- libavformat/dv.c | 2 +- libavformat/filmstripdec.c | 2 +- libavformat/flacdec.c | 4 ++-- libavformat/flacenc.c | 2 +- libavformat/flvdec.c | 8 ++++---- libavformat/flvenc.c | 6 ++++-- libavformat/ingenientdec.c | 4 ++-- libavformat/iv8.c | 2 +- libavformat/ivfdec.c | 4 ++-- libavformat/ivfenc.c | 10 +++++----- libavformat/libnut.c | 4 ++-- libavformat/matroskaenc.c | 10 ++++++---- libavformat/movenc.c | 40 ++++++++++++++++++++------------------ libavformat/mp3dec.c | 4 ++-- libavformat/mp3enc.c | 2 +- libavformat/mpc.c | 2 +- libavformat/mpeg.c | 2 +- libavformat/mpegts.c | 10 +++++----- libavformat/mpegtsenc.c | 2 +- libavformat/mvi.c | 2 +- libavformat/mxg.c | 12 ++++++------ libavformat/ncdec.c | 2 +- libavformat/nullenc.c | 2 +- libavformat/nutdec.c | 7 +++++-- libavformat/nutenc.c | 7 +++++-- libavformat/nuv.c | 2 +- libavformat/pva.c | 2 +- libavformat/rawdec.c | 18 ++++++++--------- libavformat/rawenc.c | 34 ++++++++++++++++---------------- libavformat/rawvideodec.c | 6 +++--- libavformat/rmenc.c | 2 +- libavformat/rtpenc.c | 2 +- libavformat/sapdec.c | 2 +- libavformat/sapenc.c | 2 +- libavformat/siff.c | 2 +- libavformat/spdifdec.c | 2 +- libavformat/spdifenc.c | 4 ++-- libavformat/tmv.c | 2 +- libavformat/tta.c | 2 +- libavformat/vc1test.c | 2 +- libavformat/vocdec.c | 2 +- libavformat/vocenc.c | 2 +- libavformat/wav.c | 12 ++++++------ libavformat/yop.c | 4 ++-- libavformat/yuv4mpeg.c | 2 +- 63 files changed, 174 insertions(+), 156 deletions(-) diff --git a/libavformat/a64.c b/libavformat/a64.c index 3cea50b6c5..8748b3e8ab 100644 --- a/libavformat/a64.c +++ b/libavformat/a64.c @@ -164,12 +164,12 @@ static int a64_write_trailer(struct AVFormatContext *s) } AVOutputFormat ff_a64_muxer = { - .name = "a64", - .long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"), - .extensions = "a64, A64", + .name = "a64", + .long_name = NULL_IF_CONFIG_SMALL("a64 - video for Commodore 64"), + .extensions = "a64, A64", .priv_data_size = sizeof (A64Context), - .video_codec = CODEC_ID_A64_MULTI, - .write_header = a64_write_header, - .write_packet = a64_write_packet, - .write_trailer = a64_write_trailer + .video_codec = CODEC_ID_A64_MULTI, + .write_header = a64_write_header, + .write_packet = a64_write_packet, + .write_trailer = a64_write_trailer, }; diff --git a/libavformat/aacdec.c b/libavformat/aacdec.c index 992376ed38..2aedd5d1d7 100644 --- a/libavformat/aacdec.c +++ b/libavformat/aacdec.c @@ -87,7 +87,7 @@ AVInputFormat ff_aac_demuxer = { .read_probe = adts_aac_probe, .read_header = adts_aac_read_header, .read_packet = ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "aac", + .flags = AVFMT_GENERIC_INDEX, + .extensions = "aac", .raw_codec_id = CODEC_ID_AAC, }; diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c index 4078b1b6bc..60c3cf97e4 100644 --- a/libavformat/ac3dec.c +++ b/libavformat/ac3dec.c @@ -94,8 +94,8 @@ AVInputFormat ff_eac3_demuxer = { .read_probe = eac3_probe, .read_header = ff_raw_audio_read_header, .read_packet = ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "eac3", + .flags = AVFMT_GENERIC_INDEX, + .extensions = "eac3", .raw_codec_id = CODEC_ID_EAC3, }; #endif diff --git a/libavformat/aea.c b/libavformat/aea.c index e360b10415..716b885ef1 100644 --- a/libavformat/aea.c +++ b/libavformat/aea.c @@ -100,6 +100,6 @@ AVInputFormat ff_aea_demuxer = { .read_header = aea_read_header, .read_packet = aea_read_packet, .read_seek = ff_pcm_read_seek, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "aea", + .flags = AVFMT_GENERIC_INDEX, + .extensions = "aea", }; diff --git a/libavformat/aiffdec.c b/libavformat/aiffdec.c index 27d42ea4d0..3e4140626b 100644 --- a/libavformat/aiffdec.c +++ b/libavformat/aiffdec.c @@ -328,5 +328,5 @@ AVInputFormat ff_aiff_demuxer = { .read_header = aiff_read_header, .read_packet = aiff_read_packet, .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 }, }; diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c index 2916d26fc6..861558c78b 100644 --- a/libavformat/aiffenc.c +++ b/libavformat/aiffenc.c @@ -160,5 +160,5 @@ AVOutputFormat ff_aiff_muxer = { .write_header = aiff_write_header, .write_packet = aiff_write_packet, .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 }, }; diff --git a/libavformat/amr.c b/libavformat/amr.c index 9dd8471d56..96f559b227 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -177,7 +177,7 @@ AVInputFormat ff_amr_demuxer = { .read_probe = amr_probe, .read_header = amr_read_header, .read_packet = amr_read_packet, - .flags = AVFMT_GENERIC_INDEX, + .flags = AVFMT_GENERIC_INDEX, }; #endif diff --git a/libavformat/ape.c b/libavformat/ape.c index 1968286745..b3fca23db5 100644 --- a/libavformat/ape.c +++ b/libavformat/ape.c @@ -438,5 +438,5 @@ AVInputFormat ff_ape_demuxer = { .read_packet = ape_read_packet, .read_close = ape_read_close, .read_seek = ape_read_seek, - .extensions = "ape,apl,mac" + .extensions = "ape,apl,mac", }; diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index f094647ba0..0cb43a578b 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -1292,5 +1292,5 @@ AVInputFormat ff_asf_demuxer = { .read_close = asf_read_close, .read_seek = asf_read_seek, .read_timestamp = asf_read_pts, - .flags = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH, + .flags = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH, }; diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 1cfc857418..e45232dea4 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -893,8 +893,10 @@ AVOutputFormat ff_asf_muxer = { .write_header = asf_write_header, .write_packet = asf_write_packet, .write_trailer = asf_write_trailer, - .flags = AVFMT_GLOBALHEADER, - .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0}, + .flags = AVFMT_GLOBALHEADER, + .codec_tag = (const AVCodecTag* const []){ + codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0 + }, }; #endif @@ -914,7 +916,9 @@ AVOutputFormat ff_asf_stream_muxer = { .write_header = asf_write_stream_header, .write_packet = asf_write_packet, .write_trailer = asf_write_trailer, - .flags = AVFMT_GLOBALHEADER, - .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0}, + .flags = AVFMT_GLOBALHEADER, + .codec_tag = (const AVCodecTag* const []){ + codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0 + }, }; #endif //CONFIG_ASF_STREAM_MUXER diff --git a/libavformat/au.c b/libavformat/au.c index dddc854ade..3a83d283bb 100644 --- a/libavformat/au.c +++ b/libavformat/au.c @@ -191,7 +191,7 @@ AVInputFormat ff_au_demuxer = { .read_header = au_read_header, .read_packet = au_read_packet, .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 @@ -206,6 +206,6 @@ AVOutputFormat ff_au_muxer = { .write_header = au_write_header, .write_packet = au_write_packet, .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 diff --git a/libavformat/avienc.c b/libavformat/avienc.c index 2a23c213b6..3689f57f11 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -654,6 +654,8 @@ AVOutputFormat ff_avi_muxer = { .write_header = avi_write_header, .write_packet = avi_write_packet, .write_trailer = avi_write_trailer, - .codec_tag= (const AVCodecTag* const []){ff_codec_bmp_tags, ff_codec_wav_tags, 0}, - .flags= AVFMT_VARIABLE_FPS, + .codec_tag = (const AVCodecTag* const []){ + ff_codec_bmp_tags, ff_codec_wav_tags, 0 + }, + .flags = AVFMT_VARIABLE_FPS, }; diff --git a/libavformat/bmv.c b/libavformat/bmv.c index ebf59e9f23..8c1eb787ce 100644 --- a/libavformat/bmv.c +++ b/libavformat/bmv.c @@ -133,5 +133,5 @@ AVInputFormat ff_bmv_demuxer = { .read_header = bmv_read_header, .read_packet = bmv_read_packet, .read_close = bmv_read_close, - .extensions = "bmv" + .extensions = "bmv", }; diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index 5d214de41e..e35026feda 100644 --- a/libavformat/cafdec.c +++ b/libavformat/cafdec.c @@ -394,5 +394,5 @@ AVInputFormat ff_caf_demuxer = { .read_header = read_header, .read_packet = read_packet, .read_seek = read_seek, - .codec_tag = (const AVCodecTag*[]){ff_codec_caf_tags, 0}, + .codec_tag = (const AVCodecTag*[]){ ff_codec_caf_tags, 0 }, }; diff --git a/libavformat/cdg.c b/libavformat/cdg.c index c0adf3b917..bbc3b4025c 100644 --- a/libavformat/cdg.c +++ b/libavformat/cdg.c @@ -68,5 +68,5 @@ AVInputFormat ff_cdg_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("CD Graphics Format"), .read_header = read_header, .read_packet = read_packet, - .extensions = "cdg" + .extensions = "cdg", }; diff --git a/libavformat/daud.c b/libavformat/daud.c index 8de4aad119..ef02b1a60a 100644 --- a/libavformat/daud.c +++ b/libavformat/daud.c @@ -75,7 +75,7 @@ AVInputFormat ff_daud_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("D-Cinema audio format"), .read_header = daud_header, .read_packet = daud_packet, - .extensions = "302", + .extensions = "302", }; #endif diff --git a/libavformat/dfa.c b/libavformat/dfa.c index 283a607168..2ab3596674 100644 --- a/libavformat/dfa.c +++ b/libavformat/dfa.c @@ -114,5 +114,5 @@ AVInputFormat ff_dfa_demuxer = { .read_probe = dfa_probe, .read_header = dfa_read_header, .read_packet = dfa_read_packet, - .flags = AVFMT_GENERIC_INDEX, + .flags = AVFMT_GENERIC_INDEX, }; diff --git a/libavformat/dtsdec.c b/libavformat/dtsdec.c index 95bae54519..c8da0d41ad 100644 --- a/libavformat/dtsdec.c +++ b/libavformat/dtsdec.c @@ -71,7 +71,7 @@ AVInputFormat ff_dts_demuxer = { .read_probe = dts_probe, .read_header = ff_raw_audio_read_header, .read_packet = ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "dts", + .flags = AVFMT_GENERIC_INDEX, + .extensions = "dts", .raw_codec_id = CODEC_ID_DTS, }; diff --git a/libavformat/dv.c b/libavformat/dv.c index 14be5fb27b..b96b3ba6e7 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -542,6 +542,6 @@ AVInputFormat ff_dv_demuxer = { .read_packet = dv_read_packet, .read_close = dv_read_close, .read_seek = dv_read_seek, - .extensions = "dv,dif", + .extensions = "dv,dif", }; #endif diff --git a/libavformat/filmstripdec.c b/libavformat/filmstripdec.c index 1a3b947ec7..074194a8ce 100644 --- a/libavformat/filmstripdec.c +++ b/libavformat/filmstripdec.c @@ -106,5 +106,5 @@ AVInputFormat ff_filmstrip_demuxer = { .read_header = read_header, .read_packet = read_packet, .read_seek = read_seek, - .extensions = "flm", + .extensions = "flm", }; diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 7174fcf758..8981a5679d 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -155,7 +155,7 @@ AVInputFormat ff_flac_demuxer = { .read_probe = flac_probe, .read_header = flac_read_header, .read_packet = ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "flac", + .flags = AVFMT_GENERIC_INDEX, + .extensions = "flac", .raw_codec_id = CODEC_ID_FLAC, }; diff --git a/libavformat/flacenc.c b/libavformat/flacenc.c index 725dc714ce..436e10dd88 100644 --- a/libavformat/flacenc.c +++ b/libavformat/flacenc.c @@ -127,5 +127,5 @@ AVOutputFormat ff_flac_muxer = { .write_header = flac_write_header, .write_packet = flac_write_packet, .write_trailer = flac_write_trailer, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index 55ac9dab3f..7c4b792af9 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -707,10 +707,10 @@ AVInputFormat ff_flv_demuxer = { .read_probe = flv_probe, .read_header = flv_read_header, .read_packet = flv_read_packet, - .read_seek = flv_read_seek, + .read_seek = flv_read_seek, #if 0 - .read_seek2 = flv_read_seek2, + .read_seek2 = flv_read_seek2, #endif - .read_close = flv_read_close, - .extensions = "flv", + .read_close = flv_read_close, + .extensions = "flv", }; diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 623bea701e..42ecde1845 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -484,6 +484,8 @@ AVOutputFormat ff_flv_muxer = { .write_header = flv_write_header, .write_packet = flv_write_packet, .write_trailer = flv_write_trailer, - .codec_tag= (const AVCodecTag* const []){flv_video_codec_ids, flv_audio_codec_ids, 0}, - .flags= AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, + .codec_tag = (const AVCodecTag* const []){ + flv_video_codec_ids, flv_audio_codec_ids, 0 + }, + .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, }; diff --git a/libavformat/ingenientdec.c b/libavformat/ingenientdec.c index bed525fad6..5b22242e51 100644 --- a/libavformat/ingenientdec.c +++ b/libavformat/ingenientdec.c @@ -66,8 +66,8 @@ AVInputFormat ff_ingenient_demuxer = { .priv_data_size = sizeof(FFRawVideoDemuxerContext), .read_header = ff_raw_video_read_header, .read_packet = ingenient_read_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "cgi", // FIXME + .flags = AVFMT_GENERIC_INDEX, + .extensions = "cgi", // FIXME .raw_codec_id = CODEC_ID_MJPEG, .priv_class = &ingenient_demuxer_class, }; diff --git a/libavformat/iv8.c b/libavformat/iv8.c index e597911a97..4402855946 100644 --- a/libavformat/iv8.c +++ b/libavformat/iv8.c @@ -114,5 +114,5 @@ AVInputFormat ff_iv8_demuxer = { .read_probe = probe, .read_header = read_header, .read_packet = read_packet, - .flags= AVFMT_GENERIC_INDEX, + .flags = AVFMT_GENERIC_INDEX, }; diff --git a/libavformat/ivfdec.c b/libavformat/ivfdec.c index ae84a6fd81..9482fc2ab0 100644 --- a/libavformat/ivfdec.c +++ b/libavformat/ivfdec.c @@ -86,6 +86,6 @@ AVInputFormat ff_ivf_demuxer = { .read_probe = probe, .read_header = read_header, .read_packet = read_packet, - .flags= AVFMT_GENERIC_INDEX, - .codec_tag = (const AVCodecTag*[]){ff_codec_bmp_tags, 0}, + .flags = AVFMT_GENERIC_INDEX, + .codec_tag = (const AVCodecTag*[]){ ff_codec_bmp_tags, 0 }, }; diff --git a/libavformat/ivfenc.c b/libavformat/ivfenc.c index 55ce58615b..560ec9a0e3 100644 --- a/libavformat/ivfenc.c +++ b/libavformat/ivfenc.c @@ -59,11 +59,11 @@ static int ivf_write_packet(AVFormatContext *s, AVPacket *pkt) } AVOutputFormat ff_ivf_muxer = { - .name = "ivf", - .long_name = NULL_IF_CONFIG_SMALL("On2 IVF"), - .extensions = "ivf", - .audio_codec = CODEC_ID_NONE, - .video_codec = CODEC_ID_VP8, + .name = "ivf", + .long_name = NULL_IF_CONFIG_SMALL("On2 IVF"), + .extensions = "ivf", + .audio_codec = CODEC_ID_NONE, + .video_codec = CODEC_ID_VP8, .write_header = ivf_write_header, .write_packet = ivf_write_packet, }; diff --git a/libavformat/libnut.c b/libavformat/libnut.c index 3bb355852e..4295d67015 100644 --- a/libavformat/libnut.c +++ b/libavformat/libnut.c @@ -162,7 +162,7 @@ AVOutputFormat ff_libnut_muxer = { .write_header = nut_write_header, .write_packet = nut_write_packet, .write_trailer = nut_write_trailer, - .flags = AVFMT_GLOBALHEADER, + .flags = AVFMT_GLOBALHEADER, }; #endif /* CONFIG_LIBNUT_MUXER */ @@ -307,5 +307,5 @@ AVInputFormat ff_libnut_demuxer = { .read_packet = nut_read_packet, .read_close = nut_read_close, .read_seek = nut_read_seek, - .extensions = "nut", + .extensions = "nut", }; diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 984d0f1565..9334b52d6d 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1306,7 +1306,9 @@ AVOutputFormat ff_matroska_muxer = { .write_packet = mkv_write_packet, .write_trailer = mkv_write_trailer, .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, .query_codec = mkv_query_codec, }; @@ -1324,7 +1326,7 @@ AVOutputFormat ff_webm_muxer = { .write_header = mkv_write_header, .write_packet = mkv_write_packet, .write_trailer = mkv_write_trailer, - .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, + .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS, }; #endif @@ -1344,7 +1346,7 @@ AVOutputFormat ff_matroska_audio_muxer = { .write_header = mkv_write_header, .write_packet = mkv_write_packet, .write_trailer = mkv_write_trailer, - .flags = AVFMT_GLOBALHEADER, - .codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0}, + .flags = AVFMT_GLOBALHEADER, + .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 }, }; #endif diff --git a/libavformat/movenc.c b/libavformat/movenc.c index f776c7575c..5777443db2 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3279,9 +3279,11 @@ AVOutputFormat ff_mov_muxer = { .write_header = mov_write_header, .write_packet = ff_mov_write_packet, .write_trailer = mov_write_trailer, - .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, - .codec_tag = (const AVCodecTag* const []){ff_codec_movvideo_tags, ff_codec_movaudio_tags, 0}, - .priv_class = &mov_muxer_class, + .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, + .codec_tag = (const AVCodecTag* const []){ + ff_codec_movvideo_tags, ff_codec_movaudio_tags, 0 + }, + .priv_class = &mov_muxer_class, }; #endif #if CONFIG_TGP_MUXER @@ -3296,9 +3298,9 @@ AVOutputFormat ff_tgp_muxer = { .write_header = mov_write_header, .write_packet = ff_mov_write_packet, .write_trailer = mov_write_trailer, - .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, - .codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0}, - .priv_class = &tgp_muxer_class, + .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, + .codec_tag = (const AVCodecTag* const []){ codec_3gp_tags, 0 }, + .priv_class = &tgp_muxer_class, }; #endif #if CONFIG_MP4_MUXER @@ -3318,9 +3320,9 @@ AVOutputFormat ff_mp4_muxer = { .write_header = mov_write_header, .write_packet = ff_mov_write_packet, .write_trailer = mov_write_trailer, - .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, - .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0}, - .priv_class = &mp4_muxer_class, + .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, + .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 }, + .priv_class = &mp4_muxer_class, }; #endif #if CONFIG_PSP_MUXER @@ -3339,9 +3341,9 @@ AVOutputFormat ff_psp_muxer = { .write_header = mov_write_header, .write_packet = ff_mov_write_packet, .write_trailer = mov_write_trailer, - .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, - .codec_tag = (const AVCodecTag* const []){ff_mp4_obj_type, 0}, - .priv_class = &psp_muxer_class, + .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, + .codec_tag = (const AVCodecTag* const []){ ff_mp4_obj_type, 0 }, + .priv_class = &psp_muxer_class, }; #endif #if CONFIG_TG2_MUXER @@ -3356,9 +3358,9 @@ AVOutputFormat ff_tg2_muxer = { .write_header = mov_write_header, .write_packet = ff_mov_write_packet, .write_trailer = mov_write_trailer, - .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, - .codec_tag = (const AVCodecTag* const []){codec_3gp_tags, 0}, - .priv_class = &tg2_muxer_class, + .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, + .codec_tag = (const AVCodecTag* const []){ codec_3gp_tags, 0 }, + .priv_class = &tg2_muxer_class, }; #endif #if CONFIG_IPOD_MUXER @@ -3374,9 +3376,9 @@ AVOutputFormat ff_ipod_muxer = { .write_header = mov_write_header, .write_packet = ff_mov_write_packet, .write_trailer = mov_write_trailer, - .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, - .codec_tag = (const AVCodecTag* const []){codec_ipod_tags, 0}, - .priv_class = &ipod_muxer_class, + .flags = AVFMT_GLOBALHEADER | AVFMT_ALLOW_FLUSH, + .codec_tag = (const AVCodecTag* const []){ codec_ipod_tags, 0 }, + .priv_class = &ipod_muxer_class, }; #endif #if CONFIG_ISMV_MUXER @@ -3393,7 +3395,7 @@ AVOutputFormat ff_ismv_muxer = { .write_packet = ff_mov_write_packet, .write_trailer = mov_write_trailer, .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, }; #endif diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index fc8b8a9e7b..d233209f97 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -193,6 +193,6 @@ AVInputFormat ff_mp3_demuxer = { .read_probe = mp3_read_probe, .read_header = mp3_read_header, .read_packet = mp3_read_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "mp2,mp3,m2a", /* XXX: use probe */ + .flags = AVFMT_GENERIC_INDEX, + .extensions = "mp2,mp3,m2a", /* XXX: use probe */ }; diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index fb46ac94ca..5365e3d505 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -319,6 +319,6 @@ AVOutputFormat ff_mp3_muxer = { .write_packet = mp3_write_packet, .write_trailer = mp3_write_trailer, .flags = AVFMT_NOTIMESTAMPS, - .priv_class = &mp3_muxer_class, + .priv_class = &mp3_muxer_class, }; #endif diff --git a/libavformat/mpc.c b/libavformat/mpc.c index 86e6f8e5b8..03d362998f 100644 --- a/libavformat/mpc.c +++ b/libavformat/mpc.c @@ -231,5 +231,5 @@ AVInputFormat ff_mpc_demuxer = { .read_packet = mpc_read_packet, .read_close = mpc_read_close, .read_seek = mpc_read_seek, - .extensions = "mpc", + .extensions = "mpc", }; diff --git a/libavformat/mpeg.c b/libavformat/mpeg.c index 6a26d6d292..f0aed06864 100644 --- a/libavformat/mpeg.c +++ b/libavformat/mpeg.c @@ -614,5 +614,5 @@ AVInputFormat ff_mpegps_demuxer = { .read_header = mpegps_read_header, .read_packet = mpegps_read_packet, .read_timestamp = mpegps_read_dts, - .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT, + .flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT, }; diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index c6af892889..e06792763c 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2266,9 +2266,9 @@ AVInputFormat ff_mpegts_demuxer = { .read_close = mpegts_read_close, .read_seek = read_seek, .read_timestamp = mpegts_get_pcr, - .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT, + .flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT, #ifdef USE_SYNCPOINT_SEARCH - .read_seek2 = read_seek2, + .read_seek2 = read_seek2, #endif }; @@ -2281,9 +2281,9 @@ AVInputFormat ff_mpegtsraw_demuxer = { .read_close = mpegts_read_close, .read_seek = read_seek, .read_timestamp = mpegts_get_pcr, - .flags = AVFMT_SHOW_IDS|AVFMT_TS_DISCONT, + .flags = AVFMT_SHOW_IDS | AVFMT_TS_DISCONT, #ifdef USE_SYNCPOINT_SEARCH - .read_seek2 = read_seek2, + .read_seek2 = read_seek2, #endif - .priv_class = &mpegtsraw_class, + .priv_class = &mpegtsraw_class, }; diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index b55de9dd07..f60594abeb 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -1125,5 +1125,5 @@ AVOutputFormat ff_mpegts_muxer = { .write_packet = mpegts_write_packet, .write_trailer = mpegts_write_end, .flags = AVFMT_ALLOW_FLUSH, - .priv_class = &mpegts_muxer_class, + .priv_class = &mpegts_muxer_class, }; diff --git a/libavformat/mvi.c b/libavformat/mvi.c index 6e937b2acd..673a712104 100644 --- a/libavformat/mvi.c +++ b/libavformat/mvi.c @@ -130,5 +130,5 @@ AVInputFormat ff_mvi_demuxer = { .priv_data_size = sizeof(MviDemuxContext), .read_header = read_header, .read_packet = read_packet, - .extensions = "mvi" + .extensions = "mvi", }; diff --git a/libavformat/mxg.c b/libavformat/mxg.c index 3f8c3e339e..cb983f1462 100644 --- a/libavformat/mxg.c +++ b/libavformat/mxg.c @@ -240,11 +240,11 @@ static int mxg_close(struct AVFormatContext *s) } AVInputFormat ff_mxg_demuxer = { - .name = "mxg", - .long_name = NULL_IF_CONFIG_SMALL("MxPEG clip file format"), + .name = "mxg", + .long_name = NULL_IF_CONFIG_SMALL("MxPEG clip file format"), .priv_data_size = sizeof(MXGContext), - .read_header = mxg_read_header, - .read_packet = mxg_read_packet, - .read_close = mxg_close, - .extensions = "mxg" + .read_header = mxg_read_header, + .read_packet = mxg_read_packet, + .read_close = mxg_close, + .extensions = "mxg", }; diff --git a/libavformat/ncdec.c b/libavformat/ncdec.c index 44e227ad8f..cc8ae9593a 100644 --- a/libavformat/ncdec.c +++ b/libavformat/ncdec.c @@ -97,5 +97,5 @@ AVInputFormat ff_nc_demuxer = { .read_probe = nc_probe, .read_header = nc_read_header, .read_packet = nc_read_packet, - .extensions = "v", + .extensions = "v", }; diff --git a/libavformat/nullenc.c b/libavformat/nullenc.c index 9849f460f0..eec6eee309 100644 --- a/libavformat/nullenc.c +++ b/libavformat/nullenc.c @@ -32,5 +32,5 @@ AVOutputFormat ff_null_muxer = { .audio_codec = AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE), .video_codec = CODEC_ID_RAWVIDEO, .write_packet = null_write_packet, - .flags = AVFMT_NOFILE | AVFMT_NOTIMESTAMPS | AVFMT_RAWPICTURE, + .flags = AVFMT_NOFILE | AVFMT_NOTIMESTAMPS | AVFMT_RAWPICTURE, }; diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 8d1b17ddc9..a2104f181e 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -931,7 +931,10 @@ AVInputFormat ff_nut_demuxer = { .read_packet = nut_read_packet, .read_close = nut_read_close, .read_seek = read_seek, - .extensions = "nut", - .codec_tag = (const AVCodecTag * const []) { ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, ff_nut_subtitle_tags, 0 }, + .extensions = "nut", + .codec_tag = (const AVCodecTag * const []) { + ff_codec_bmp_tags, ff_nut_video_tags, ff_codec_wav_tags, + ff_nut_subtitle_tags, 0 + }, }; #endif diff --git a/libavformat/nutenc.c b/libavformat/nutenc.c index ae1c2f194c..21af7ca9cf 100644 --- a/libavformat/nutenc.c +++ b/libavformat/nutenc.c @@ -877,6 +877,9 @@ AVOutputFormat ff_nut_muxer = { .write_header = nut_write_header, .write_packet = nut_write_packet, .write_trailer = nut_write_trailer, - .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 }, + .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 + }, }; diff --git a/libavformat/nuv.c b/libavformat/nuv.c index 86be778e4c..c1dc07f18f 100644 --- a/libavformat/nuv.c +++ b/libavformat/nuv.c @@ -266,5 +266,5 @@ AVInputFormat ff_nuv_demuxer = { .read_probe = nuv_probe, .read_header = nuv_header, .read_packet = nuv_packet, - .flags = AVFMT_GENERIC_INDEX, + .flags = AVFMT_GENERIC_INDEX, }; diff --git a/libavformat/pva.c b/libavformat/pva.c index 21373a5367..064f4039cc 100644 --- a/libavformat/pva.c +++ b/libavformat/pva.c @@ -208,5 +208,5 @@ AVInputFormat ff_pva_demuxer = { .read_probe = pva_probe, .read_header = pva_read_header, .read_packet = pva_read_packet, - .read_timestamp = pva_read_timestamp + .read_timestamp = pva_read_timestamp, }; diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 63e963f8a4..1ef780b952 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -180,8 +180,8 @@ AVInputFormat ff_g722_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("raw G.722"), .read_header = ff_raw_read_header, .read_packet = ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "g722,722", + .flags = AVFMT_GENERIC_INDEX, + .extensions = "g722,722", .raw_codec_id = CODEC_ID_ADPCM_G722, }; #endif @@ -192,8 +192,8 @@ AVInputFormat ff_latm_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("raw LOAS/LATM"), .read_header = ff_raw_audio_read_header, .read_packet = ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "latm", + .flags = AVFMT_GENERIC_INDEX, + .extensions = "latm", .raw_codec_id = CODEC_ID_AAC_LATM, }; #endif @@ -208,8 +208,8 @@ AVInputFormat ff_mlp_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("raw MLP"), .read_header = ff_raw_audio_read_header, .read_packet = ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "mlp", + .flags = AVFMT_GENERIC_INDEX, + .extensions = "mlp", .raw_codec_id = CODEC_ID_MLP, }; #endif @@ -220,8 +220,8 @@ AVInputFormat ff_truehd_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("raw TrueHD"), .read_header = ff_raw_audio_read_header, .read_packet = ff_raw_read_partial_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "thd", + .flags = AVFMT_GENERIC_INDEX, + .extensions = "thd", .raw_codec_id = CODEC_ID_TRUEHD, }; #endif @@ -233,7 +233,7 @@ AVInputFormat ff_shorten_demuxer = { .read_header = ff_raw_audio_read_header, .read_packet = ff_raw_read_partial_packet, .flags = AVFMT_NOBINSEARCH | AVFMT_NOGENSEARCH | AVFMT_NO_BYTE_SEEK, - .extensions = "shn", + .extensions = "shn", .raw_codec_id = CODEC_ID_SHORTEN, }; #endif diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 6e9f4b78ec..4ad0558b89 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -41,7 +41,7 @@ AVOutputFormat ff_ac3_muxer = { .audio_codec = CODEC_ID_AC3, .video_codec = CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -65,7 +65,7 @@ AVOutputFormat ff_dirac_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_DIRAC, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -77,7 +77,7 @@ AVOutputFormat ff_dnxhd_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_DNXHD, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -90,7 +90,7 @@ AVOutputFormat ff_dts_muxer = { .audio_codec = CODEC_ID_DTS, .video_codec = CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -103,7 +103,7 @@ AVOutputFormat ff_eac3_muxer = { .audio_codec = CODEC_ID_EAC3, .video_codec = CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -116,7 +116,7 @@ AVOutputFormat ff_g722_muxer = { .audio_codec = CODEC_ID_ADPCM_G722, .video_codec = CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -129,7 +129,7 @@ AVOutputFormat ff_h261_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_H261, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -142,7 +142,7 @@ AVOutputFormat ff_h263_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_H263, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -154,7 +154,7 @@ AVOutputFormat ff_h264_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_H264, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -166,7 +166,7 @@ AVOutputFormat ff_cavsvideo_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_CAVS, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -178,7 +178,7 @@ AVOutputFormat ff_m4v_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_MPEG4, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -191,7 +191,7 @@ AVOutputFormat ff_mjpeg_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_MJPEG, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -203,7 +203,7 @@ AVOutputFormat ff_mlp_muxer = { .audio_codec = CODEC_ID_MLP, .video_codec = CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -227,7 +227,7 @@ AVOutputFormat ff_truehd_muxer = { .audio_codec = CODEC_ID_TRUEHD, .video_codec = CODEC_ID_NONE, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -240,7 +240,7 @@ AVOutputFormat ff_mpeg1video_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_MPEG1VIDEO, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -252,7 +252,7 @@ AVOutputFormat ff_mpeg2video_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_MPEG2VIDEO, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif @@ -264,6 +264,6 @@ AVOutputFormat ff_rawvideo_muxer = { .audio_codec = CODEC_ID_NONE, .video_codec = CODEC_ID_RAWVIDEO, .write_packet = ff_raw_write_packet, - .flags= AVFMT_NOTIMESTAMPS, + .flags = AVFMT_NOTIMESTAMPS, }; #endif diff --git a/libavformat/rawvideodec.c b/libavformat/rawvideodec.c index 5db4e91f2e..c27cd7c5db 100644 --- a/libavformat/rawvideodec.c +++ b/libavformat/rawvideodec.c @@ -66,8 +66,8 @@ AVInputFormat ff_rawvideo_demuxer = { .priv_data_size = sizeof(FFRawVideoDemuxerContext), .read_header = ff_raw_read_header, .read_packet = rawvideo_read_packet, - .flags= AVFMT_GENERIC_INDEX, - .extensions = "yuv,cif,qcif,rgb", + .flags = AVFMT_GENERIC_INDEX, + .extensions = "yuv,cif,qcif,rgb", .raw_codec_id = CODEC_ID_RAWVIDEO, - .priv_class = &rawvideo_demuxer_class, + .priv_class = &rawvideo_demuxer_class, }; diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c index 0312d161c7..a6df21b432 100644 --- a/libavformat/rmenc.c +++ b/libavformat/rmenc.c @@ -471,5 +471,5 @@ AVOutputFormat ff_rm_muxer = { .write_header = rm_write_header, .write_packet = rm_write_packet, .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 }, }; diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 78121ed3c5..29fc2f4aa7 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -503,5 +503,5 @@ AVOutputFormat ff_rtp_muxer = { .write_header = rtp_write_header, .write_packet = rtp_write_packet, .write_trailer = rtp_write_trailer, - .priv_class = &rtp_muxer_class, + .priv_class = &rtp_muxer_class, }; diff --git a/libavformat/sapdec.c b/libavformat/sapdec.c index f0f592e1fb..46a4b96b93 100644 --- a/libavformat/sapdec.c +++ b/libavformat/sapdec.c @@ -234,5 +234,5 @@ AVInputFormat ff_sap_demuxer = { .read_header = sap_read_header, .read_packet = sap_fetch_packet, .read_close = sap_read_close, - .flags = AVFMT_NOFILE, + .flags = AVFMT_NOFILE, }; diff --git a/libavformat/sapenc.c b/libavformat/sapenc.c index 0913dd7a45..ca133f561f 100644 --- a/libavformat/sapenc.c +++ b/libavformat/sapenc.c @@ -258,5 +258,5 @@ AVOutputFormat ff_sap_muxer = { .write_header = sap_write_header, .write_packet = sap_write_packet, .write_trailer = sap_write_close, - .flags = AVFMT_NOFILE | AVFMT_GLOBALHEADER, + .flags = AVFMT_NOFILE | AVFMT_GLOBALHEADER, }; diff --git a/libavformat/siff.c b/libavformat/siff.c index 64260dd1ac..bbea96ea11 100644 --- a/libavformat/siff.c +++ b/libavformat/siff.c @@ -237,5 +237,5 @@ AVInputFormat ff_siff_demuxer = { .read_probe = siff_probe, .read_header = siff_read_header, .read_packet = siff_read_packet, - .extensions = "vb,son" + .extensions = "vb,son", }; diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c index 106dd8f479..3b1e10f3c3 100644 --- a/libavformat/spdifdec.c +++ b/libavformat/spdifdec.c @@ -231,5 +231,5 @@ AVInputFormat ff_spdif_demuxer = { .read_probe = spdif_probe, .read_header = spdif_read_header, .read_packet = spdif_read_packet, - .flags = AVFMT_GENERIC_INDEX, + .flags = AVFMT_GENERIC_INDEX, }; diff --git a/libavformat/spdifenc.c b/libavformat/spdifenc.c index 5a1b8e4cb0..b25c7fa722 100644 --- a/libavformat/spdifenc.c +++ b/libavformat/spdifenc.c @@ -553,6 +553,6 @@ AVOutputFormat ff_spdif_muxer = { .write_header = spdif_write_header, .write_packet = spdif_write_packet, .write_trailer = spdif_write_trailer, - .flags = AVFMT_NOTIMESTAMPS, - .priv_class = &class, + .flags = AVFMT_NOTIMESTAMPS, + .priv_class = &class, }; diff --git a/libavformat/tmv.c b/libavformat/tmv.c index 8a96b721ab..0231505c68 100644 --- a/libavformat/tmv.c +++ b/libavformat/tmv.c @@ -188,5 +188,5 @@ AVInputFormat ff_tmv_demuxer = { .read_header = tmv_read_header, .read_packet = tmv_read_packet, .read_seek = tmv_read_seek, - .flags = AVFMT_GENERIC_INDEX, + .flags = AVFMT_GENERIC_INDEX, }; diff --git a/libavformat/tta.c b/libavformat/tta.c index 0b2337baf2..c5b0792b0e 100644 --- a/libavformat/tta.c +++ b/libavformat/tta.c @@ -166,5 +166,5 @@ AVInputFormat ff_tta_demuxer = { .read_header = tta_read_header, .read_packet = tta_read_packet, .read_seek = tta_read_seek, - .extensions = "tta", + .extensions = "tta", }; diff --git a/libavformat/vc1test.c b/libavformat/vc1test.c index 3354ad4b8f..ffb165598a 100644 --- a/libavformat/vc1test.c +++ b/libavformat/vc1test.c @@ -115,5 +115,5 @@ AVInputFormat ff_vc1t_demuxer = { .read_probe = vc1t_probe, .read_header = vc1t_read_header, .read_packet = vc1t_read_packet, - .flags = AVFMT_GENERIC_INDEX, + .flags = AVFMT_GENERIC_INDEX, }; diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c index 3c27062408..b0af480a9e 100644 --- a/libavformat/vocdec.c +++ b/libavformat/vocdec.c @@ -171,5 +171,5 @@ AVInputFormat ff_voc_demuxer = { .read_probe = voc_probe, .read_header = voc_read_header, .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 }, }; diff --git a/libavformat/vocenc.c b/libavformat/vocenc.c index d0986bb02b..30e38bfeba 100644 --- a/libavformat/vocenc.c +++ b/libavformat/vocenc.c @@ -100,5 +100,5 @@ AVOutputFormat ff_voc_muxer = { .write_header = voc_write_header, .write_packet = voc_write_packet, .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 }, }; diff --git a/libavformat/wav.c b/libavformat/wav.c index bccc3dbdee..85849c1e75 100644 --- a/libavformat/wav.c +++ b/libavformat/wav.c @@ -216,8 +216,8 @@ AVOutputFormat ff_wav_muxer = { .write_header = wav_write_header, .write_packet = wav_write_packet, .write_trailer = wav_write_trailer, - .codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0}, - .priv_class = &wav_muxer_class, + .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 }, + .priv_class = &wav_muxer_class, }; #endif /* CONFIG_WAV_MUXER */ @@ -593,8 +593,8 @@ AVInputFormat ff_wav_demuxer = { .read_header = wav_read_header, .read_packet = wav_read_packet, .read_seek = wav_read_seek, - .flags= AVFMT_GENERIC_INDEX, - .codec_tag= (const AVCodecTag* const []){ff_codec_wav_tags, 0}, + .flags = AVFMT_GENERIC_INDEX, + .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 }, }; #endif /* CONFIG_WAV_DEMUXER */ @@ -681,7 +681,7 @@ AVInputFormat ff_w64_demuxer = { .read_header = w64_read_header, .read_packet = wav_read_packet, .read_seek = wav_read_seek, - .flags = AVFMT_GENERIC_INDEX, - .codec_tag = (const AVCodecTag* const []){ff_codec_wav_tags, 0}, + .flags = AVFMT_GENERIC_INDEX, + .codec_tag = (const AVCodecTag* const []){ ff_codec_wav_tags, 0 }, }; #endif /* CONFIG_W64_DEMUXER */ diff --git a/libavformat/yop.c b/libavformat/yop.c index f10d8b6d39..ba49830992 100644 --- a/libavformat/yop.c +++ b/libavformat/yop.c @@ -213,6 +213,6 @@ AVInputFormat ff_yop_demuxer = { .read_packet = yop_read_packet, .read_close = yop_read_close, .read_seek = yop_read_seek, - .extensions = "yop", - .flags = AVFMT_GENERIC_INDEX, + .extensions = "yop", + .flags = AVFMT_GENERIC_INDEX, }; diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index df0fc8f1a5..fef6aa0172 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -419,6 +419,6 @@ AVInputFormat ff_yuv4mpegpipe_demuxer = { .read_probe = yuv4_probe, .read_header = yuv4_read_header, .read_packet = yuv4_read_packet, - .extensions = "y4m" + .extensions = "y4m", }; #endif