diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 15:28:49 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-22 15:28:49 +0400 |
commit | d7fbb63122b87347e57cd8a586adff09f8de5921 (patch) | |
tree | 4047c9b3a494b768fd6a7fa346808e2f1986ce19 /libavcodec/vc1dec.c | |
parent | 8c63ee4296a87d1fdbbce5501230b6fd9c8d04d8 (diff) | |
parent | de4ec972c06d9047bc1b73bb13f858a5d77d8df0 (diff) |
Merge commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0'
* commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0':
vc1: fix a memleak.
Conflicts:
libavcodec/vc1dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vc1dec.c')
-rw-r--r-- | libavcodec/vc1dec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index a81f96182b..d6756594bc 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -6212,12 +6212,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, pict); + *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, pict); - } - if (s->last_picture_ptr || s->low_delay) { *got_frame = 1; } } |