Merge commit '5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 18:49:20 +0000 (20:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 24 Apr 2015 18:49:45 +0000 (20:49 +0200)
commit036162a3787044cd82b6fa4e73eb56ddf2e57c96
tree439565a59d99e1322a993f7632e23f037f841658
parent10a28e8a08d609b9f8352c221845d15cd0021675
parent5bba3ab0cf7a0238ee1ea31ca2da08ce860fd8f9
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