diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 20:00:01 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 20:01:20 +0400 |
commit | 8367bc6be890472efee13e191eac5d7214eab2d2 (patch) | |
tree | 90f57f958b054cc84539864f39f6a7aa83609519 /libavcodec/pthread_frame.c | |
parent | 30056fd0be8ace0754e0568787bb4c18ea49edeb (diff) | |
parent | 9cbf2d78f0a9c19129e7a70b2281a450d386c6d9 (diff) |
Merge commit '9cbf2d78f0a9c19129e7a70b2281a450d386c6d9'
* commit '9cbf2d78f0a9c19129e7a70b2281a450d386c6d9':
pthread_frame: unref decoded frames on failure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pthread_frame.c')
-rw-r--r-- | libavcodec/pthread_frame.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index f7a40ca7ec..42a3c9b247 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -152,6 +152,13 @@ static attribute_align_arg void *frame_worker_thread(void *arg) p->got_frame = 0; p->result = codec->decode(avctx, p->frame, &p->got_frame, &p->avpkt); + if ((p->result < 0 || !p->got_frame) && p->frame->buf[0]) { + if (avctx->internal->allocate_progress) + av_log(avctx, AV_LOG_ERROR, "A frame threaded decoder did not " + "free the frame on failure. This is a bug, please report it.\n"); + av_frame_unref(p->frame); + } + if (p->state == STATE_SETTING_UP) ff_thread_finish_setup(avctx); pthread_mutex_lock(&p->progress_mutex); |