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)
commit85146dfc23d39caf0167158cee2b6786a2616fff
tree940d79e03eb4d23786b90bf5e539192fa7b818ba
parentedb4c445119501070cb00be1696d47c6d6462e2a
parent0c9c4004ed57de210b4d83c7b39bbfb00b86b9af
Merge commit '0c9c4004ed57de210b4d83c7b39bbfb00b86b9af'

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

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