aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2012-09-27 19:25:06 +0200
committerAnton Khirnov <anton@khirnov.net>2012-10-06 09:45:49 +0200
commitaa4121276777b20eaaa83bf9bd544b00748c865c (patch)
tree05402c0892877886feee0a995b328a7dfc6ae6d0
parent44e6cf3f75f00d201a8cb1b836251f5a826186a0 (diff)
downloadffmpeg-aa4121276777b20eaaa83bf9bd544b00748c865c.tar.gz
vc1dec: add flush function for WMV9 and VC-1 decoders
CC: libav-stable@libav.org (cherry picked from commit 4dc8c8386eef942dba35c4f2fb3210e22b511a5b) Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 02b72394627933dc8ce26445231a69f00dba491b) Conflicts: libavcodec/vc1dec.c Signed-off-by: Anton Khirnov <anton@khirnov.net> (cherry picked from commit 0173a7966b331105158a88f96b9afcc431d2fef8) Signed-off-by: Anton Khirnov <anton@khirnov.net>
-rw-r--r--libavcodec/vc1dec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index abcc5ecda8..8d31e8bc1e 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -3328,6 +3328,7 @@ AVCodec vc1_decoder = {
vc1_decode_frame,
CODEC_CAP_DR1 | CODEC_CAP_DELAY,
NULL,
+ .flush = ff_mpeg_flush,
.long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"),
.pix_fmts = ff_hwaccel_pixfmt_list_420
};
@@ -3344,6 +3345,7 @@ AVCodec wmv3_decoder = {
vc1_decode_frame,
CODEC_CAP_DR1 | CODEC_CAP_DELAY,
NULL,
+ .flush = ff_mpeg_flush,
.long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"),
.pix_fmts = ff_hwaccel_pixfmt_list_420
};