Merge commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193'

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

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

diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index 1827e1a4addcebb81de6e8bf17bc7e559dd2470a..c3a5ca00fdd8b125786b55f21c6f1c28e5846971 100644 (file)
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -686,6 +686,9 @@ int av_vdpau_bind_context(AVCodecContext *avctx, VdpDevice device,
 {
     VDPAUHWContext *hwctx;
 
+    if (flags != 0)
+        return AVERROR(EINVAL);
+
     if (av_reallocp(&avctx->hwaccel_context, sizeof(*hwctx)))
         return AVERROR(ENOMEM);