diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-28 15:36:22 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-28 15:54:40 +0400 |
| commit | 2acb5cd90793de7f375bf6ebf4eabe2b59a2ecc3 (patch) | |
| tree | 5d827d355bab646ca6ccdebe930ac927a02c3713 /libavcodec/vc1dec.c | |
| parent | 4fefe91a33956007f17cfd6e0c5ee1cb3a3f36d8 (diff) | |
| parent | d16860a237ae56a21d051df6556c40de9be53faa (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libopus: Remap channels using libopus' internal remapping.
Opus decoder using libopus
avcodec: document the use of AVCodecContext.delay for audio decoding
vc1dec: add flush function for WMV9 and VC-1 decoders
http: Increase buffer sizes to cope with longer URIs
nutenc: const correctness for ff_put_v_trace/put_s_trace function arguments
h264_refs: Fix debug tprintf argument types
golomb: const correctness for get_ue()/get_se() function arguments
get_bits: const correctness for get_bits_trace()/get_xbits_trace() arguments
Conflicts:
Changelog
libavcodec/Makefile
libavcodec/version.h
libavformat/http.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dec.c')
| -rw-r--r-- | libavcodec/vc1dec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 3f62201979..9412a79192 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -5704,6 +5704,7 @@ AVCodec ff_vc1_decoder = { .init = vc1_decode_init, .close = ff_vc1_decode_end, .decode = vc1_decode_frame, + .flush = ff_mpeg_flush, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, .long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"), .pix_fmts = ff_hwaccel_pixfmt_list_420, @@ -5719,6 +5720,7 @@ AVCodec ff_wmv3_decoder = { .init = vc1_decode_init, .close = ff_vc1_decode_end, .decode = vc1_decode_frame, + .flush = ff_mpeg_flush, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_DELAY, .long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"), .pix_fmts = ff_hwaccel_pixfmt_list_420, |