[FFmpeg-cvslog] Merge commit '2cef68da69a17ed09c313ba3c3850ec1cc0a80e0'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan  6 22:12:53 2015 +0100| [2ab6deb36f1904cf97b8f276414043b2f9574135] | committer: Michael Niedermayer

Merge commit '2cef68da69a17ed09c313ba3c3850ec1cc0a80e0'

* commit '2cef68da69a17ed09c313ba3c3850ec1cc0a80e0':
  vda: error out if decoded CVPixelBuffer is empty

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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