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/flicvideo.c | |
| parent | e7279638e8558d929465d2cc7c1d8ffe3cbf565d (diff) | |
| download | ffmpeg-streaming-1ec94b0f066f14153d86395980a31b7466de3d9d.zip ffmpeg-streaming-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/flicvideo.c')
| -rw-r--r-- | libavcodec/flicvideo.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 27584cb..90885fc 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -185,10 +185,8 @@ static int flic_decode_frame_8BPP(AVCodecContext *avctx, bytestream2_init(&g2, buf, buf_size); - 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; - } pixels = s->frame.data[0]; pixel_limit = s->avctx->height * s->frame.linesize[0]; @@ -505,10 +503,8 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx, bytestream2_init(&g2, buf, buf_size); - 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; - } pixels = s->frame.data[0]; pixel_limit = s->avctx->height * s->frame.linesize[0]; |
