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/ac3dec.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/ac3dec.c')
| -rw-r--r-- | libavcodec/ac3dec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c index 87f1067b91..0e584a5b31 100644 --- a/libavcodec/ac3dec.c +++ b/libavcodec/ac3dec.c @@ -1375,10 +1375,8 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, /* get output buffer */ frame->nb_samples = s->num_blocks * 256; - 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; - } /* decode the audio blocks */ channel_map = ff_ac3_dec_channel_map[s->output_mode & ~AC3_OUTPUT_LFEON][s->lfe_on]; |