Merge commit '2d097c16b833c532ac974a7f1fd05c0a1f3b7675'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Nov 2016 09:46:02 +0000 (10:46 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 18 Nov 2016 09:46:02 +0000 (10:46 +0100)
commit7e9474ca47fd4d267bdafcc8162fded67f6410e5
tree3d9ff5dff4634e797274ba831ae1b81ce9bf1f50
parent0bd76401d1666bf8f0a67946d761ed9ba4751e49
parent2d097c16b833c532ac974a7f1fd05c0a1f3b7675
Merge commit '2d097c16b833c532ac974a7f1fd05c0a1f3b7675'

* commit '2d097c16b833c532ac974a7f1fd05c0a1f3b7675':
  libopenh264enc: Return a more sensible error code in some init failure paths

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