aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libspeexdec.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2013-03-12 08:41:53 +0100
committerClément Bœsch <ubitux@gmail.com>2013-03-13 19:00:10 +0100
commit1ec94b0f066f14153d86395980a31b7466de3d9d (patch)
treeb4c979679b299e9b457d026752173f7c084485ec /libavcodec/libspeexdec.c
parente7279638e8558d929465d2cc7c1d8ffe3cbf565d (diff)
downloadffmpeg-1ec94b0f066f14153d86395980a31b7466de3d9d.tar.gz
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.
Diffstat (limited to 'libavcodec/libspeexdec.c')
-rw-r--r--libavcodec/libspeexdec.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/libspeexdec.c b/libavcodec/libspeexdec.c
index 1544647691..7c1ffa6f67 100644
--- a/libavcodec/libspeexdec.c
+++ b/libavcodec/libspeexdec.c
@@ -118,10 +118,8 @@ static int libspeex_decode_frame(AVCodecContext *avctx, void *data,
/* get output buffer */
frame->nb_samples = s->frame_size;
- if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
- av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)
return ret;
- }
output = (int16_t *)frame->data[0];
/* if there is not enough data left for the smallest possible frame or the