diff options
author | Clément Bœsch <ubitux@gmail.com> | 2013-03-12 08:41:53 +0100 |
---|---|---|
committer | Clément Bœsch <ubitux@gmail.com> | 2013-03-13 19:00:10 +0100 |
commit | 1ec94b0f066f14153d86395980a31b7466de3d9d (patch) | |
tree | b4c979679b299e9b457d026752173f7c084485ec /libavcodec/smacker.c | |
parent | e7279638e8558d929465d2cc7c1d8ffe3cbf565d (diff) | |
download | ffmpeg-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/smacker.c')
-rw-r--r-- | libavcodec/smacker.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 3530033f44..c070150f7d 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -381,10 +381,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (avpkt->size <= 769) return AVERROR_INVALIDDATA; - if ((ret = ff_reget_buffer(avctx, &smk->pic)) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + if ((ret = ff_reget_buffer(avctx, &smk->pic)) < 0) return ret; - } /* make the palette available on the way out */ pal = (uint32_t*)smk->pic.data[1]; @@ -634,10 +632,8 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, /* get output buffer */ frame->nb_samples = unp_size / (avctx->channels * (bits + 1)); - 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; - } samples = (int16_t *)frame->data[0]; samples8 = frame->data[0]; |