[FFmpeg-cvslog] Merge commit 'bef067f88c74190cdf7e76d12f02e12e069974aa'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct  6 15:11:46 2014 +0200| [573d3330107b9a49d6bfbfc739727f8d1516a7a1] | committer: Michael Niedermayer

Merge commit 'bef067f88c74190cdf7e76d12f02e12e069974aa'

* commit 'bef067f88c74190cdf7e76d12f02e12e069974aa':
  vdpau: check video surface and decoder capabilities

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

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