* commit '5bba3ab0':
  internal: Make dlog/tlog a no-op when disabled

Conflicts:
	libavcodec/internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>