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