[FFmpeg-cvslog] Merge commit '0c9c4004ed57de210b4d83c7b39bbfb00b86b9af'

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Fri Oct  7 13:28:53 2016 +0200| [85146dfc23d39caf0167158cee2b6786a2616fff] | committer: Hendrik Leppkes

Merge commit '0c9c4004ed57de210b4d83c7b39bbfb00b86b9af'

* commit '0c9c4004ed57de210b4d83c7b39bbfb00b86b9af':
  omx: Don't return > 0 from omx_encode_frame

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

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