]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit '0c9c4004ed57de210b4d83c7b39bbfb00b86b9af'
authorHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 11:28:53 +0000 (13:28 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Fri, 7 Oct 2016 11:28:53 +0000 (13:28 +0200)
* commit '0c9c4004ed57de210b4d83c7b39bbfb00b86b9af':
  omx: Don't return > 0 from omx_encode_frame

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

Trivial merge