Merge commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Oct 2014 10:17:15 +0000 (12:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 15 Oct 2014 10:17:59 +0000 (12:17 +0200)
commitfd937866f7b7ae3303e8a78b1e9a48d853360d62
treec0fdef099f3e57f6f9a8bab236ef705f6e104167
parenta72e75bf980c4faf3940be20e891050fe6dfe409
parentc1724623ce0433c6a9ee72133b1fd4db75ec7193
Merge commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/vdpau.c