]> git.sesse.net Git - ffmpeg/commitdiff
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)
* commit '2d097c16b833c532ac974a7f1fd05c0a1f3b7675':
  libopenh264enc: Return a more sensible error code in some init failure paths

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

Simple merge