[FFmpeg-cvslog] mimic: Always return on failure
Luca Barbato
git at videolan.org
Tue Nov 10 17:58:11 CET 2015
ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sun Nov 1 04:07:46 2015 +0100| [4a326923381f2bc0fb7d960c8f8366a5456bc4ab] | committer: Luca Barbato
mimic: Always return on failure
Bug-Id: 905
CC: libav-stable at libav.org
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a326923381f2bc0fb7d960c8f8366a5456bc4ab
---
libavcodec/mimic.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c
index 379cffc..b8b3285 100644
--- a/libavcodec/mimic.c
+++ b/libavcodec/mimic.c
@@ -431,10 +431,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)
More information about the ffmpeg-cvslog
mailing list