diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-07 00:52:01 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-07 00:52:01 +0400 |
| commit | 2e0c360abd74b94991aa9a271cadc72aae1471c2 (patch) | |
| tree | cbea40b59f334f8f7447a79b6fbdf514f0dd2e0c /libavformat/asfenc.c | |
| parent | bd128e9bff8aaec97ce7dcd414717c214536c7d9 (diff) | |
| parent | 20234a4bd7e187ae31f9a66b5c40e98666bc30e4 (diff) | |
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>
Diffstat (limited to 'libavformat/asfenc.c')
| -rw-r--r-- | libavformat/asfenc.c | 12 |
1 files changed, 8 insertions, 4 deletions
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 |