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/g729dec.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/g729dec.c')
| -rw-r--r-- | libavcodec/g729dec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c index c9af3705b2..440bf80cfc 100644 --- a/libavcodec/g729dec.c +++ b/libavcodec/g729dec.c @@ -420,10 +420,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, int is_periodic = 0; // whether one of the subframes is declared as periodic or not ctx->frame.nb_samples = SUBFRAME_SIZE<<1; - if ((ret = ff_get_buffer(avctx, &ctx->frame, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + if ((ret = ff_get_buffer(avctx, &ctx->frame, 0)) < 0) return ret; - } out_frame = (int16_t*) ctx->frame.data[0]; if (buf_size == 10) { |