[FFmpeg-cvslog] Merge commit '6996fd204a7f28b46a8c3c97bcf223998218c743'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 29 14:13:16 2015 +0100| [d39fa69dfc64d96562d2d2707bf250493d53d34c] | committer: Michael Niedermayer

Merge commit '6996fd204a7f28b46a8c3c97bcf223998218c743'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d39fa69dfc64d96562d2d2707bf250493d53d34c
---