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/gifdec.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/gifdec.c')
-rw-r--r-- | libavcodec/gifdec.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index 617e5b7583..27364c9713 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -469,10 +469,8 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, A avcodec_set_dimensions(avctx, s->screen_width, s->screen_height); av_frame_unref(s->frame); - if ((ret = ff_get_buffer(avctx, s->frame, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + if ((ret = ff_get_buffer(avctx, s->frame, 0)) < 0) return ret; - } av_fast_malloc(&s->idx_line, &s->idx_line_size, s->screen_width); if (!s->idx_line) @@ -487,10 +485,8 @@ static int gif_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, A return AVERROR_INVALIDDATA; } - if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) { - av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n"); + if ((ret = ff_reget_buffer(avctx, s->frame)) < 0) return ret; - } s->frame->pict_type = AV_PICTURE_TYPE_P; s->frame->key_frame = 0; |