[FFmpeg-cvslog] vc1dec: add flush function for WMV9 and VC-1 decoders
Kostya Shishkov
git at videolan.org
Tue Oct 16 18:17:35 CEST 2012
ffmpeg | branch: release/0.5 | Kostya Shishkov <kostya.shishkov at gmail.com> | Thu Sep 27 19:25:06 2012 +0200| [9125aa9218c3ff2ae89ef2094c9138438dbeec70] | committer: Anton Khirnov
vc1dec: add flush function for WMV9 and VC-1 decoders
CC: libav-stable at libav.org
(cherry picked from commit 4dc8c8386eef942dba35c4f2fb3210e22b511a5b)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 02b72394627933dc8ce26445231a69f00dba491b)
Conflicts:
libavcodec/vc1dec.c
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 0173a7966b331105158a88f96b9afcc431d2fef8)
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit aa4121276777b20eaaa83bf9bd544b00748c865c)
Conflicts:
libavcodec/vc1dec.c
Signed-off-by: Anton Khirnov <anton at khirnov.net>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9125aa9218c3ff2ae89ef2094c9138438dbeec70
---
libavcodec/vc1.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/vc1.c b/libavcodec/vc1.c
index 619e903..3b8cd22 100644
--- a/libavcodec/vc1.c
+++ b/libavcodec/vc1.c
@@ -4347,6 +4347,7 @@ AVCodec vc1_decoder = {
vc1_decode_frame,
CODEC_CAP_DELAY,
NULL,
+ .flush = ff_mpeg_flush,
.long_name = NULL_IF_CONFIG_SMALL("SMPTE VC-1"),
.pix_fmts = ff_pixfmt_list_420
};
@@ -4362,6 +4363,7 @@ AVCodec wmv3_decoder = {
vc1_decode_frame,
CODEC_CAP_DELAY,
NULL,
+ .flush = ff_mpeg_flush,
.long_name = NULL_IF_CONFIG_SMALL("Windows Media Video 9"),
.pix_fmts = ff_pixfmt_list_420
};
More information about the ffmpeg-cvslog
mailing list