[FFmpeg-cvslog] Merge commit '71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Jan  8 17:12:49 2015 +0100| [de8f70b8e02dd0b036c5bd0b219dd495de976b58] | committer: Michael Niedermayer

Merge commit '71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8'

* commit '71ec3d36fa6122b3b6c5c68a21b9c70cb2e668e8':
  doc: Add initial documentation about the OpenH264 encoder wrapper

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

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