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/flvdec.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/flvdec.c')
| -rw-r--r-- | libavformat/flvdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
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", }; |