diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 20:49:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 20:49:45 +0200 |
| commit | 036162a3787044cd82b6fa4e73eb56ddf2e57c96 (patch) | |
| tree | 439565a59d99e1322a993f7632e23f037f841658 | |
| parent | 10a28e8a08d609b9f8352c221845d15cd0021675 (diff) | |
| parent | 5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9 (diff) | |
| download | ffmpeg-036162a3787044cd82b6fa4e73eb56ddf2e57c96.tar.gz | |
Merge commit '5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9'
* commit '5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9':
internal: Make dlog/tlog a no-op when disabled
Conflicts:
libavcodec/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 83f185d538..a49bf34a26 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -57,7 +57,7 @@ #ifdef TRACE # define ff_tlog(ctx, ...) av_log(ctx, AV_LOG_TRACE, __VA_ARGS__) #else -# define ff_tlog(p, ...) +# define ff_tlog(ctx, ...) while(0) #endif |