diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-10 17:56:48 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-11-10 17:56:48 +0100 |
| commit | 446ac80ea594de6fca73dcba65fce8b06810fe96 (patch) | |
| tree | 8168c346841a22144017d55b84308c5ad71cb0a9 /libavcodec/mimic.c | |
| parent | b40e43c5c40158c2d9490fb0db1109a5387ff8d5 (diff) | |
| parent | 4a326923381f2bc0fb7d960c8f8366a5456bc4ab (diff) | |
| download | ffmpeg-446ac80ea594de6fca73dcba65fce8b06810fe96.tar.gz | |
Merge commit '4a326923381f2bc0fb7d960c8f8366a5456bc4ab'
* commit '4a326923381f2bc0fb7d960c8f8366a5456bc4ab':
mimic: Always return on failure
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/mimic.c')
| -rw-r--r-- | libavcodec/mimic.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index a856b33a15..d4959eacf1 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -432,10 +432,9 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data, res = decode(ctx, quality, num_coeffs, !is_pframe); ff_thread_report_progress(&ctx->frames[ctx->cur_index], INT_MAX, 0); if (res < 0) { - if (!(avctx->active_thread_type & FF_THREAD_FRAME)) { + if (!(avctx->active_thread_type & FF_THREAD_FRAME)) ff_thread_release_buffer(avctx, &ctx->frames[ctx->cur_index]); - return res; - } + return res; } if ((res = av_frame_ref(data, ctx->frames[ctx->cur_index].f)) < 0) |