[FFmpeg-cvslog] Merge commit 'd3da8a0035734529c4e26696c9a0c6cb56633838'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Thu Apr 13 18:31:44 2017 -0300| [e688ca102ed304e88d1441141e6e8a74e18aa227] | committer: James Almer

Merge commit 'd3da8a0035734529c4e26696c9a0c6cb56633838'

* commit 'd3da8a0035734529c4e26696c9a0c6cb56633838':
  omx: Fix allocation check

This commit is a noop, see 16a75304fe42d3a007c78126b6370c94ccf891f6

Merged-by: James Almer <jamrial at gmail.com>

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