[FFmpeg-devel] [PATCH 3/4] Fix error recovery code on size changes in vp5/6 decoder

[fenrir at elivagar.org]

From: Laurent Aimar <fenrir at videolan.org>

---
 libavcodec/vp56.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c
index 698201b..3b2ac95 100644
--- a/libavcodec/vp56.c
+++ b/libavcodec/vp56.c
@@ -467,6 +467,7 @@ static int vp56_size_changed(AVCodecContext *avctx)
     s->mb_height = (avctx->coded_height+15) / 16;
 
     if (s->mb_width > 1000 || s->mb_height > 1000) {
+        avcodec_set_dimensions(avctx, 0, 0);
         av_log(avctx, AV_LOG_ERROR, "picture too big\n");
         return -1;
     }
@@ -521,8 +522,10 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
                 if (s->frames[i].data[0])
                     avctx->release_buffer(avctx, &s->frames[i]);
             }
-            if (is_alpha)
+            if (is_alpha) {
+                avcodec_set_dimensions(avctx, 0, 0);
                 return -1;
+            }
         }
 
         if (!is_alpha) {
-- 
1.7.2.5