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/nutenc.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/nutenc.c')
-rw-r--r-- | libavformat/nutenc.c | 7 |
1 files changed, 5 insertions, 2 deletions
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 + }, }; |