Michael Niedermayer 036162a378 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>

2015-04-24 20:49:45 +02:00

8.8 KiB

Raw Blame History

View Raw