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)
* commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193':
  vdpau: have av_vdpau_bind_context() fail on unsupported flag

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

Simple merge