mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '4a326923381f2bc0fb7d960c8f8366a5456bc4ab'
* commit '4a326923381f2bc0fb7d960c8f8366a5456bc4ab': mimic: Always return on failure Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
commit
446ac80ea5
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue