aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mvcdec.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/mvcdec.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/mvcdec.c')
-rw-r--r--libavcodec/mvcdec.c7
1 files changed, 2 insertions, 5 deletions
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)