[FFmpeg-cvslog] Merge commit '9e14a992409348630ea96521411127418a92e8a3'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Thu Oct 29 14:26:07 2015 +0100| [f79bb118f58988059768140e517b67a6fb2c07c7] | committer: Hendrik Leppkes

Merge commit '9e14a992409348630ea96521411127418a92e8a3'

* commit '9e14a992409348630ea96521411127418a92e8a3':
  libopenh264enc: Add an option for controlling the frame skipping

Merged-by: Hendrik Leppkes <h.leppkes at gmail.com>

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