mirror of
https://gitee.com/openharmony/third_party_ffmpeg
synced 2024-11-25 12:19:52 +00:00
Merge commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0'
* commit 'de4ec972c06d9047bc1b73bb13f858a5d77d8df0': vc1: fix a memleak. Conflicts: libavcodec/vc1dec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
d7fbb63122
@ -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;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user