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/libschroedingerdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libavcodec/libschroedingerdec.c') diff --git a/libavcodec/libschroedingerdec.c b/libavcodec/libschroedingerdec.c index 7720344..2e0ce5d 100644 --- a/libavcodec/libschroedingerdec.c +++ b/libavcodec/libschroedingerdec.c @@ -306,10 +306,10 @@ static int libschroedinger_decode_frame(AVCodecContext *avctx, framewithpts = ff_schro_queue_pop(&p_schro_params->dec_frame_queue); if (framewithpts && framewithpts->frame) { - if (ff_get_buffer(avctx, avframe, 0) < 0) { - av_log(avctx, AV_LOG_ERROR, "Unable to allocate buffer\n"); - return AVERROR(ENOMEM); - } + int ret; + + if ((ret = ff_get_buffer(avctx, avframe, 0)) < 0) + return ret; memcpy(avframe->data[0], framewithpts->frame->components[0].data, -- cgit v1.1