[FFmpeg-cvslog] vp56dec: avoid freeing the returned frame before returning it.

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Mar 24 05:21:39 2012 +0100| [d85b3c4fff4c4b255232fcc01edbd57f19d60998] | committer: Michael Niedermayer

vp56dec: avoid freeing the returned frame before returning it.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

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

diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c
index 63b844e..c6e32af 100644
--- a/libavcodec/vp56.c
+++ b/libavcodec/vp56.c
@@ -621,7 +621,7 @@ int ff_vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size,
 
     next:
         if (p->key_frame || golden_frame) {
-            if (s->framep[VP56_FRAME_GOLDEN]->data[0] &&
+            if (s->framep[VP56_FRAME_GOLDEN]->data[0] && s->framep[VP56_FRAME_GOLDEN] != p &&
                 s->framep[VP56_FRAME_GOLDEN] != s->framep[VP56_FRAME_GOLDEN2])
                 avctx->release_buffer(avctx, s->framep[VP56_FRAME_GOLDEN]);
             s->framep[VP56_FRAME_GOLDEN] = p;