Merge commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/89/head
Michael Niedermayer 10 years ago
commit fd937866f7
  1. 3
      libavcodec/vdpau.c

@ -686,6 +686,9 @@ int av_vdpau_bind_context(AVCodecContext *avctx, VdpDevice device,
{ {
VDPAUHWContext *hwctx; VDPAUHWContext *hwctx;
if (flags != 0)
return AVERROR(EINVAL);
if (av_reallocp(&avctx->hwaccel_context, sizeof(*hwctx))) if (av_reallocp(&avctx->hwaccel_context, sizeof(*hwctx)))
return AVERROR(ENOMEM); return AVERROR(ENOMEM);

Loading…
Cancel
Save