Merge commit '9e14a992409348630ea96521411127418a92e8a3'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 29 Oct 2015 13:26:07 +0000 (14:26 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 29 Oct 2015 13:26:07 +0000 (14:26 +0100)
commitf79bb118f58988059768140e517b67a6fb2c07c7
treeb1bec7ebd178b767c79feeeb26d18fcc392da291
parent313f53824ef4d868a61f7f1886dde7b61cde5388
parent9e14a992409348630ea96521411127418a92e8a3
Merge commit '9e14a992409348630ea96521411127418a92e8a3'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/libopenh264enc.c