summaryrefslogtreecommitdiff
path: root/libavcodec/vp56.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-24 05:21:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-24 05:21:39 +0100
commitd85b3c4fff4c4b255232fcc01edbd57f19d60998 (patch)
treef43f1729c2cf9b6c3c0722d2ea60630b6c618b04 /libavcodec/vp56.c
parent25715064c2ef4978672a91f8c856f3e8809a7c45 (diff)
vp56dec: avoid freeing the returned frame before returning it.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vp56.c')
-rw-r--r--libavcodec/vp56.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c
index 63b844e700..c6e32af867 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;