[FFmpeg-cvslog] Merge commit '25c29d32835f38cdc5f0c84fa27dfc489a228770'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  6 11:31:19 2015 +0100| [39becc949c04033e3377e7f5f7dbecbbb0824b23] | committer: Michael Niedermayer

Merge commit '25c29d32835f38cdc5f0c84fa27dfc489a228770'

* commit '25c29d32835f38cdc5f0c84fa27dfc489a228770':
  libopenh264enc: Add support for building with OpenH264 1.4

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

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