From 1ec94b0f066f14153d86395980a31b7466de3d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= 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/vble.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'libavcodec/vble.c') diff --git a/libavcodec/vble.c b/libavcodec/vble.c index 76dfef8750..cbb2ffc54e 100644 --- a/libavcodec/vble.c +++ b/libavcodec/vble.c @@ -121,6 +121,7 @@ static int vble_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, int version; int offset = 0; int width_uv = avctx->width / 2, height_uv = avctx->height / 2; + int ret; if (avpkt->size < 4 || avpkt->size - 4 > INT_MAX/8) { av_log(avctx, AV_LOG_ERROR, "Invalid packet size\n"); @@ -128,10 +129,8 @@ static int vble_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } /* Allocate buffer */ - if (ff_get_buffer(avctx, pic, 0) < 0) { - av_log(avctx, AV_LOG_ERROR, "Could not allocate buffer.\n"); - return AVERROR(ENOMEM); - } + if ((ret = ff_get_buffer(avctx, pic, 0)) < 0) + return ret; /* Set flags */ pic->key_frame = 1; -- cgit v1.2.3