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/pthread.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/pthread.c')
| -rw-r--r-- | libavcodec/pthread.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index d4997e9c47..799644ff43 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -940,7 +940,7 @@ int ff_thread_can_start_frame(AVCodecContext *avctx) return 1; } -int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags) +static int thread_get_buffer_internal(AVCodecContext *avctx, ThreadFrame *f, int flags) { PerThreadContext *p = avctx->thread_opaque; int err; @@ -1004,6 +1004,14 @@ int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags) return err; } +int ff_thread_get_buffer(AVCodecContext *avctx, ThreadFrame *f, int flags) +{ + int ret = thread_get_buffer_internal(avctx, f, flags); + if (ret < 0) + av_log(avctx, AV_LOG_ERROR, "thread_get_buffer() failed\n"); + return ret; +} + void ff_thread_release_buffer(AVCodecContext *avctx, ThreadFrame *f) { PerThreadContext *p = avctx->thread_opaque; |