[FFmpeg-cvslog] vp56: Release old pictures after a resolution changes

[Laurent Aimar]

ffmpeg | branch: release/0.8 | Laurent Aimar <fenrir at videolan.org> | Wed Sep 21 20:46:33 2011 +0200| [3e1b5981ba11a5eb317282078766ebb9e57b7781] | committer: Reinhard Tartler

vp56: Release old pictures after a resolution changes

Signed-off-by: Janne Grunau <janne-libav at jannau.net>
(cherry picked from commit 3d09d0017d10a0d738141a955c75c555133e41b2)

Signed-off-by: Anton Khirnov <anton at khirnov.net>

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

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

diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c
index 4fd1341..dd9dd77 100644
--- a/libavcodec/vp56.c
+++ b/libavcodec/vp56.c
@@ -465,6 +465,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;
     }
@@ -513,6 +514,18 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
         if (!res)
             return -1;
 
+        if (res == 2) {
+            int i;
+            for (i = 0; i < 4; i++) {
+                if (s->frames[i].data[0])
+                    avctx->release_buffer(avctx, &s->frames[i]);
+            }
+            if (is_alpha) {
+                avcodec_set_dimensions(avctx, 0, 0);
+                return -1;
+            }
+        }
+
         if (!is_alpha) {
             p->reference = 1;
             if (avctx->get_buffer(avctx, p) < 0) {