Merge commit '6996fd204a7f28b46a8c3c97bcf223998218c743'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 13:13:16 +0000 (14:13 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Jan 2015 13:13:25 +0000 (14:13 +0100)
commitd39fa69dfc64d96562d2d2707bf250493d53d34c
treef462dfa455e611db729623fd07509195c1e3e424
parentd43c1ec684ced58e2d4288c850ea774f06df9d23
parent6996fd204a7f28b46a8c3c97bcf223998218c743
Merge commit '6996fd204a7f28b46a8c3c97bcf223998218c743'

* commit '6996fd204a7f28b46a8c3c97bcf223998218c743':
  libopenh264: Log debug messages to a non-null context

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/libopenh264enc.c