aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-06 22:52:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-06 22:52:01 +0200
commit2e0c360abd74b94991aa9a271cadc72aae1471c2 (patch)
treecbea40b59f334f8f7447a79b6fbdf514f0dd2e0c
parentbd128e9bff8aaec97ce7dcd414717c214536c7d9 (diff)
parent20234a4bd7e187ae31f9a66b5c40e98666bc30e4 (diff)
downloadffmpeg-2e0c360abd74b94991aa9a271cadc72aae1471c2.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: cosmetics: Align muxer/demuxer declarations mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning avcodec: remove avcodec_guess_channel_layout() avutil: Add av_get_default_channel_layout() Conflicts: doc/APIchanges libavcodec/mpeg12.c libavformat/cdg.c libavformat/matroskaenc.c libavformat/mpegts.c libavformat/nuv.c libavformat/wav.c libavutil/audioconvert.c libavutil/audioconvert.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/ac3enc.c2
-rw-r--r--libavcodec/audioconvert.c14
-rw-r--r--libavcodec/audioconvert.h9
-rw-r--r--libavcodec/mpeg12.c2
-rw-r--r--libavformat/a64.c14
-rw-r--r--libavformat/aacdec.c4
-rw-r--r--libavformat/ac3dec.c4
-rw-r--r--libavformat/aea.c4
-rw-r--r--libavformat/aiffdec.c2
-rw-r--r--libavformat/aiffenc.c2
-rw-r--r--libavformat/amr.c2
-rw-r--r--libavformat/ape.c2
-rw-r--r--libavformat/asfdec.c2
-rw-r--r--libavformat/asfenc.c12
-rw-r--r--libavformat/au.c4
-rw-r--r--libavformat/avienc.c6
-rw-r--r--libavformat/bmv.c2
-rw-r--r--libavformat/cafdec.c2
-rw-r--r--libavformat/cdg.c4
-rw-r--r--libavformat/daud.c2
-rw-r--r--libavformat/dfa.c2
-rw-r--r--libavformat/dtsdec.c4
-rw-r--r--libavformat/dv.c2
-rw-r--r--libavformat/filmstripdec.c2
-rw-r--r--libavformat/flacdec.c4
-rw-r--r--libavformat/flacenc.c2
-rw-r--r--libavformat/flvdec.c8
-rw-r--r--libavformat/flvenc.c6
-rw-r--r--libavformat/ingenientdec.c4
-rw-r--r--libavformat/iv8.c2
-rw-r--r--libavformat/ivfdec.c4
-rw-r--r--libavformat/ivfenc.c10
-rw-r--r--libavformat/libnut.c4
-rw-r--r--libavformat/matroskaenc.c4
-rw-r--r--libavformat/movenc.c40
-rw-r--r--libavformat/mp3dec.c4
-rw-r--r--libavformat/mp3enc.c2
-rw-r--r--libavformat/mpc.c2
-rw-r--r--libavformat/mpeg.c2
-rw-r--r--libavformat/mpegts.c10
-rw-r--r--libavformat/mpegtsenc.c2
-rw-r--r--libavformat/mvi.c2
-rw-r--r--libavformat/mxg.c12
-rw-r--r--libavformat/ncdec.c2
-rw-r--r--libavformat/nullenc.c2
-rw-r--r--libavformat/nutdec.c7
-rw-r--r--libavformat/nutenc.c7
-rw-r--r--libavformat/nuv.c2
-rw-r--r--libavformat/pva.c2
-rw-r--r--libavformat/rawdec.c18
-rw-r--r--libavformat/rawenc.c34
-rw-r--r--libavformat/rawvideodec.c6
-rw-r--r--libavformat/rmenc.c2
-rw-r--r--libavformat/rtpenc.c2
-rw-r--r--libavformat/sapdec.c2
-rw-r--r--libavformat/sapenc.c2
-rw-r--r--libavformat/siff.c2
-rw-r--r--libavformat/spdifdec.c2
-rw-r--r--libavformat/spdifenc.c4
-rw-r--r--libavformat/tmv.c2
-rw-r--r--libavformat/tta.c2
-rw-r--r--libavformat/vc1test.c2
-rw-r--r--libavformat/vocdec.c2
-rw-r--r--libavformat/vocenc.c2
-rw-r--r--libavformat/wav.c12
-rw-r--r--libavformat/yop.c4
-rw-r--r--libavformat/yuv4mpeg.c2
-rw-r--r--libavutil/avutil.h2
68 files changed, 174 insertions, 181 deletions
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 3d01249285..e04e70d8bc 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -2071,7 +2071,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/libavcodec/audioconvert.c b/libavcodec/audioconvert.c
index 2cf36bd1ab..74c6600849 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 93b9ef1ed7..03b196bdf8 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;
diff --git a/libavcodec/mpeg12.c b/libavcodec/mpeg12.c
index 548e26d9bc..535c795899 100644
--- a/libavcodec/mpeg12.c
+++ b/libavcodec/mpeg12.c
@@ -1559,7 +1559,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");
+ av_log(s->avctx, AV_LOG_WARNING, "invalid frame_pred_frame_dct\n");
}
if (s->picture_structure == PICT_FRAME) {
diff --git a/libavformat/a64.c b/libavformat/a64.c
index 4c8a942471..2cd24083a8 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 156a3509a4..dfcb4d2040 100644
--- a/libavformat/aacdec.c
+++ b/libavformat/aacdec.c
@@ -88,7 +88,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 849b8360f8..ba05f740fd 100644
--- a/libavformat/ac3dec.c
+++ b/libavformat/ac3dec.c
@@ -96,8 +96,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 3e25e5326c..c02942b598 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 212b330931..c94863c285 100644
--- a/libavformat/aiffdec.c
+++ b/libavformat/aiffdec.c
@@ -336,5 +336,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 e5c38b1547..9165e12517 100644
--- a/libavformat/aiffenc.c
+++ b/libavformat/aiffenc.c
@@ -167,5 +167,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 e2705e9a97..39aad1d822 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 df39e37532..640a7f699b 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 5f41b98ec0..d09f3882c6 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -1301,5 +1301,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 4edca221b0..92ac818a8f 100644
--- a/libavformat/asfenc.c
+++ b/libavformat/asfenc.c
@@ -910,8 +910,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
@@ -927,7 +929,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 b29b45d3c7..67e6cab181 100644
--- a/libavformat/au.c
+++ b/libavformat/au.c
@@ -198,7 +198,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
@@ -213,6 +213,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 d27c2f58ed..3fb64e97f5 100644
--- a/libavformat/avienc.c
+++ b/libavformat/avienc.c
@@ -659,6 +659,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 7cdfd2bb0e..e4b3c45c6b 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -410,5 +410,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 e7788f35d2..51b136c6fe 100644
--- a/libavformat/cdg.c
+++ b/libavformat/cdg.c
@@ -73,6 +73,6 @@ AVInputFormat ff_cdg_demuxer = {
.long_name = NULL_IF_CONFIG_SMALL("CD Graphics Format"),
.read_header = read_header,
.read_packet = read_packet,
- .flags= AVFMT_GENERIC_INDEX,
- .extensions = "cdg"
+ .flags = AVFMT_GENERIC_INDEX,
+ .extensions = "cdg",
};
diff --git a/libavformat/daud.c b/libavformat/daud.c
index de85a5fb84..2f74c3236d 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 a838b5bed1..fa342fa11f 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 7395d79f91..7f4173e0f3 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 81a0e47ade..998173479d 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -600,6 +600,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 0038dd3749..20ab4a70fb 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 95362922ed..20245ee43d 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 e7bbb783ab..ee66e98f3a 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 94fd76d666..c44464105a 100644
--- a/libavformat/flvdec.c
+++ b/libavformat/flvdec.c
@@ -731,10 +731,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 d4820f4f58..45fe1cdc18 100644
--- a/libavformat/flvenc.c
+++ b/libavformat/flvenc.c
@@ -516,6 +516,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 0ce2b5718c..f16f4690ae 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 21f70d504a..c70a286019 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 1a6e671be5..be1e2e9237 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 5fffaf7959..8b3f3a5421 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 c6d552db59..7800d4a69c 100644
--- a/libavformat/libnut.c
+++ b/libavformat/libnut.c
@@ -164,7 +164,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 */
@@ -318,5 +318,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 8d024def40..b9b24bda6f 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1342,7 +1342,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 | AVFMT_TS_NONSTRICT,
+ .flags = AVFMT_GLOBALHEADER | AVFMT_VARIABLE_FPS | AVFMT_TS_NONSTRICT,
};
#endif
@@ -1362,6 +1362,6 @@ AVOutputFormat ff_matroska_audio_muxer = {
.write_header = mkv_write_header,
.write_packet = mkv_write_packet,
.write_trailer = mkv_write_trailer,
- .flags = AVFMT_GLOBALHEADER,
+ .flags = AVFMT_GLOBALHEADER,
};
#endif
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 73b6c66e38..60a8bb1c28 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -3375,9 +3375,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
@@ -3392,9 +3394,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
@@ -3414,9 +3416,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
@@ -3435,9 +3437,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
@@ -3452,9 +3454,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
@@ -3470,9 +3472,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
@@ -3489,7 +3491,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 8aa157c53d..31d64b2921 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -198,6 +198,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 b2c1b4211e..22810b50f9 100644
--- a/libavformat/mp3enc.c
+++ b/libavformat/mp3enc.c
@@ -485,6 +485,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 d929286ddd..4637fcb138 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 be1c85d127..2ade85ad52 100644
--- a/libavformat/mpeg.c
+++ b/libavformat/mpeg.c
@@ -620,5 +620,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 6a23f0647c..12b289340f 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -2319,9 +2319,9 @@ AVInputFormat ff_mpegts_demuxer = {
.read_packet = mpegts_read_packet,
.read_close = mpegts_read_close,
.read_timestamp = mpegts_get_dts,
- .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
};
@@ -2333,9 +2333,9 @@ AVInputFormat ff_mpegtsraw_demuxer = {
.read_packet = mpegts_raw_read_packet,
.read_close = mpegts_read_close,
.read_timestamp = mpegts_get_dts,
- .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 0618beb182..de4259c3a0 100644
--- a/libavformat/mpegtsenc.c
+++ b/libavformat/mpegtsenc.c
@@ -1157,5 +1157,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 a5a69ac19a..0444b4a00c 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 32ca2750cb..2ad611062e 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 9a46b808e7..bd4ff6827b 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 9edbf20fc8..de863ab0c5 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 810632de50..99e036d4a4 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 c753fc25ba..5d5f10c48b 100644
--- a/libavformat/nutenc.c
+++ b/libavformat/nutenc.c
@@ -878,6 +878,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 0844b566fb..e48c85a789 100644
--- a/libavformat/nuv.c
+++ b/libavformat/nuv.c
@@ -341,5 +341,5 @@ AVInputFormat ff_nuv_demuxer = {
.read_header = nuv_header,
.read_packet = nuv_packet,
.read_timestamp = nuv_read_dts,
- .flags = AVFMT_GENERIC_INDEX,
+ .flags = AVFMT_GENERIC_INDEX,
};
diff --git a/libavformat/pva.c b/libavformat/pva.c
index 199f7bc651..97efa61e4c 100644
--- a/libavformat/pva.c
+++ b/libavformat/pva.c
@@ -221,5 +221,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 34e4ae05b5..91b666051b 100644
--- a/libavformat/rawdec.c
+++ b/libavformat/rawdec.c
@@ -186,8 +186,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
@@ -198,8 +198,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
@@ -214,8 +214,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
@@ -226,8 +226,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
@@ -239,7 +239,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 4c1ede4928..cb68014be5 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
@@ -142,7 +142,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
@@ -155,7 +155,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
@@ -167,7 +167,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
@@ -179,7 +179,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
@@ -191,7 +191,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
@@ -204,7 +204,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
@@ -216,7 +216,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
@@ -240,7 +240,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
@@ -253,7 +253,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
@@ -265,7 +265,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
@@ -277,6 +277,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 7750eb2880..da80ae9c19 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 b3d0cf6a66..8a9d84017a 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 d7b6b3f124..c2736b1728 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 d806400eb1..0ee5110939 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 cd7a46ef45..609dab4b40 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 5809067903..23d422edf0 100644
--- a/libavformat/siff.c
+++ b/libavformat/siff.c
@@ -241,5 +241,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 89e9b7c3d8..e8faa92903 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 05b3879d45..13b91e4750 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 bfc5326068..c1d6044fa0 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 9c31432b7b..2de6f5fbe7 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 d26e78be87..1b662af5bb 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 6df4d8d01f..8060864406 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 0a9f24bdc2..beb72b8754 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 3af547a30e..b1f1514ab5 100644
--- a/libavformat/wav.c
+++ b/libavformat/wav.c
@@ -224,8 +224,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 */
@@ -700,8 +700,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 },
.priv_class = &wav_demuxer_class,
};
#endif /* CONFIG_WAV_DEMUXER */
@@ -789,7 +789,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 d1c24fb2fa..e8f4e8e6ab 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 9c544e8f3a..553b999802 100644
--- a/libavformat/yuv4mpeg.c
+++ b/libavformat/yuv4mpeg.c
@@ -424,6 +424,6 @@ AVInputFormat ff_yuv4mpegpipe_demuxer = {
.read_probe = yuv4_probe,
.read_header = yuv4_read_header,
.read_packet = yuv4_read_packet,
- .extensions = "y4m"
+ .extensions = "y4m",
};
#endif
diff --git a/libavutil/avutil.h b/libavutil/avutil.h
index 3bb33edb7b..150b788bfb 100644
--- a/libavutil/avutil.h
+++ b/libavutil/avutil.h
@@ -153,7 +153,7 @@
*/
#define LIBAVUTIL_VERSION_MAJOR 51
-#define LIBAVUTIL_VERSION_MINOR 44
+#define LIBAVUTIL_VERSION_MINOR 45
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \