[FFmpeg-cvslog] Merge commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 17 21:16:22 2015 +0100| [79216a189b4e55dd3dbeb49612111061f2c2b717] | committer: Michael Niedermayer

Merge commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4'

* commit '733f4b05f0e120ddd0393b23f2b6d9106cf922e4':
  avplay: Check format allocation inside decode_thread()

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

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