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>

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