From 1ec94b0f066f14153d86395980a31b7466de3d9d Mon Sep 17 00:00:00 2001
From: Clément Bœsch <ubitux@gmail.com>
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/bintext.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'libavcodec/bintext.c')

diff --git a/libavcodec/bintext.c b/libavcodec/bintext.c
index b6d7d0f84c..f8059aa1af 100644
--- a/libavcodec/bintext.c
+++ b/libavcodec/bintext.c
@@ -144,10 +144,8 @@ static int decode_frame(AVCodecContext *avctx,
     int ret;
 
     s->x = s->y = 0;
-    if (ff_reget_buffer(avctx, s->frame) < 0) {
-        av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
-        return -1;
-    }
+    if ((ret = ff_reget_buffer(avctx, s->frame)) < 0)
+        return ret;
     s->frame->pict_type           = AV_PICTURE_TYPE_I;
     s->frame->palette_has_changed = 1;
     memcpy(s->frame->data[1], s->palette, 16 * 4);
-- 
cgit v1.2.3