[FFmpeg-cvslog] Merge commit '3852e2c926ddb166c7aa69c4644a86100ea144d9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan  8 17:26:57 2015 +0100| [93870f0a0b71328d4502d8f979481e42e3cb71b4] | committer: Michael Niedermayer

Merge commit '3852e2c926ddb166c7aa69c4644a86100ea144d9'

* commit '3852e2c926ddb166c7aa69c4644a86100ea144d9':
  libopenh264enc: Fix a typo and some nitpicks

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

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