[FFmpeg-cvslog] Merge commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 17 21:08:33 2015 +0100| [32b2b7bd8c5aed23e03c2bc75ccb1d46753f8798] | committer: Michael Niedermayer

Merge commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97'

* commit '266f241193b2fa8c99bb8b1f007c66bedd3b7d97':
  avplay: Check frame allocation inside video_thread()

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

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