aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2011-03-02 11:17:33 +0000
committerMichael Niedermayer <michaelni@gmx.at>2011-03-03 14:15:11 +0100
commit4778b4dd77643267639d824ea33964ee7a98439d (patch)
tree5aefde539c729590b73fb749ad10a27c7a9b5f4f /libavcodec
parentd34ffd3ce9607bd342f69ef8eab829f90c8923ae (diff)
downloadffmpeg-4778b4dd77643267639d824ea33964ee7a98439d.tar.gz
vc1: fix decoding when end sequence is present
Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit fb985071263e6b3daff1c3d987df482b0146c2a0)
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/vc1dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index ed92d8cadd..b27b6d01c1 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -3149,7 +3149,7 @@ static int vc1_decode_frame(AVCodecContext *avctx,
const uint8_t *buf_start = buf;
/* no supplementary picture */
- if (buf_size == 0) {
+ if (buf_size == 0 || (buf_size == 4 && AV_RB32(buf) == VC1_CODE_ENDOFSEQ)) {
/* special case for last picture */
if (s->low_delay==0 && s->next_picture_ptr) {
*pict= *(AVFrame*)s->next_picture_ptr;