[FFmpeg-cvslog] Merge commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 15 12:17:15 2014 +0200| [fd937866f7b7ae3303e8a78b1e9a48d853360d62] | committer: Michael Niedermayer

Merge commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193'

* commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193':
  vdpau: have av_vdpau_bind_context() fail on unsupported flag

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

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