Do not crash when the first frame is not a keyframe (and thus none of the
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Sun, 23 Jul 2006 18:22:29 +0000 (18:22 +0000)
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>
Sun, 23 Jul 2006 18:22:29 +0000 (18:22 +0000)
necessary initialization has been done yet).

Originally committed as revision 5815 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/vp3.c

index eb9e917..b5cfbb0 100644 (file)
@@ -2235,10 +2235,15 @@ static int vp3_decode_frame(AVCodecContext *avctx,
                 vp3_calculate_pixel_addresses(s);
             else
                 theora_calculate_pixel_addresses(s);
+            s->pixel_addresses_inited = 1;
         }
     } else {
         /* allocate a new current frame */
         s->current_frame.reference = 3;
+        if (!s->pixel_addresses_inited) {
+            av_log(s->avctx, AV_LOG_ERROR, "vp3: first frame not a keyframe\n");
+            return -1;
+        }
         if(avctx->get_buffer(avctx, &s->current_frame) < 0) {
             av_log(s->avctx, AV_LOG_ERROR, "vp3: get_buffer() failed\n");
             return -1;