diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-06 22:52:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-06 22:52:01 +0200 |
| commit | 2e0c360abd74b94991aa9a271cadc72aae1471c2 (patch) | |
| tree | cbea40b59f334f8f7447a79b6fbdf514f0dd2e0c /libavformat/libnut.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/libnut.c')
| -rw-r--r-- | libavformat/libnut.c | 4 |
1 files changed, 2 insertions, 2 deletions
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", }; |