aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2013-11-15 15:33:20 +0100
committerAnton Khirnov <anton@khirnov.net>2013-11-21 20:57:36 +0100
commitde4ec972c06d9047bc1b73bb13f858a5d77d8df0 (patch)
tree678094bf1c51f52f88cacc9ccc3b4ed486db7f5e
parentca41c72c6d9515d9045bd3b68104525dee81b8d0 (diff)
downloadffmpeg-de4ec972c06d9047bc1b73bb13f858a5d77d8df0.tar.gz
vc1: fix a memleak.
Happens on a B-frame when neither low_delay nor last_picture_ptr is set (probably corrupted streams only). Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
-rw-r--r--libavcodec/vc1dec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index 5c9eb8be98..4a73d2c193 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -6097,12 +6097,11 @@ image:
if ((ret = av_frame_ref(pict, &s->current_picture_ptr->f)) < 0)
goto err;
ff_print_debug_info(s, s->current_picture_ptr);
+ *got_frame = 1;
} else if (s->last_picture_ptr != NULL) {
if ((ret = av_frame_ref(pict, &s->last_picture_ptr->f)) < 0)
goto err;
ff_print_debug_info(s, s->last_picture_ptr);
- }
- if (s->last_picture_ptr || s->low_delay) {
*got_frame = 1;
}
}