From 1ec94b0f066f14153d86395980a31b7466de3d9d Mon Sep 17 00:00:00 2001 From: Clément Bœsch Date: Tue, 12 Mar 2013 08:41:53 +0100 Subject: lavc: factorize ff_{thread_,re,}get_buffer error messages. Coccinelle profile used: @@ expression r, ctx, f, loglevel, str, flags; @@ -if ((r = ff_get_buffer(ctx, f, flags)) < 0) { - av_log(ctx, loglevel, str); - return r; -} +if ((r = ff_get_buffer(ctx, f, flags)) < 0) + return r; @@ expression r, ctx, f, loglevel, str; @@ -if ((r = ff_reget_buffer(ctx, f)) < 0) { - av_log(ctx, loglevel, str); - return r; -} +if ((r = ff_reget_buffer(ctx, f)) < 0) + return r; @@ expression r, ctx, f, loglevel, str, flags; @@ -if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) { - av_log(ctx, loglevel, str); - return r; -} +if ((r = ff_thread_get_buffer(ctx, f, flags)) < 0) + return r; ...along with some manual patches for the remaining ones. --- libavcodec/mvcdec.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'libavcodec/mvcdec.c') diff --git a/libavcodec/mvcdec.c b/libavcodec/mvcdec.c index 7848d32efd..54e975717f 100644 --- a/libavcodec/mvcdec.c +++ b/libavcodec/mvcdec.c @@ -230,11 +230,8 @@ static int mvc_decode_frame(AVCodecContext *avctx, GetByteContext gb; int ret; - ret = ff_reget_buffer(avctx, s->frame); - if (ret < 0) { - av_log (avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); - return AVERROR(ENOMEM); - } + if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) + return ret; bytestream2_init(&gb, avpkt->data, avpkt->size); if (avctx->codec_id == AV_CODEC_ID_MVC1) -- cgit v1.2.3