[FFmpeg-cvslog] vc1: Do not assume seek happens after decoding

Luca Barbato git at videolan.org
Sat Dec 20 02:24:16 CET 2014


ffmpeg | branch: release/2.4 | Luca Barbato <lu_zero at gentoo.org> | Sat Oct  4 12:40:35 2014 +0200| [3ea49fc5081d63277ecbc12ed440af4b02ddfdf9] | committer: Luca Barbato

vc1: Do not assume seek happens after decoding

If a seek is requested before the decoding start there is no
current picture.

CC: libav-stable at libav.org
(cherry picked from commit 3e348ecfc6ab1830e43288a9e12e8f0a000afbcb)
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3ea49fc5081d63277ecbc12ed440af4b02ddfdf9
---

 libavcodec/vc1dec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 8ad4f0f..4c9ff03 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -5503,7 +5503,7 @@ static void vc1_sprite_flush(AVCodecContext *avctx)
        Since we can't enforce it, clear to black the missing sprite. This is
        wrong but it looks better than doing nothing. */
 
-    if (f->data[0])
+    if (f && f->data[0])
         for (plane = 0; plane < (s->flags&CODEC_FLAG_GRAY ? 1 : 3); plane++)
             for (i = 0; i < v->sprite_height>>!!plane; i++)
                 memset(f->data[plane] + i * f->linesize[plane],



More information about the ffmpeg-cvslog mailing list