Module: libav Branch: master Commit: de4ec972c06d9047bc1b73bb13f858a5d77d8df0
Author: Anton Khirnov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Fri Nov 15 15:33:20 2013 +0100 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 --- libavcodec/vc1dec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 5c9eb8b..4a73d2c 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; } } _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
