diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 12:17:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-15 12:17:59 +0200 |
| commit | fd937866f7b7ae3303e8a78b1e9a48d853360d62 (patch) | |
| tree | c0fdef099f3e57f6f9a8bab236ef705f6e104167 | |
| parent | a72e75bf980c4faf3940be20e891050fe6dfe409 (diff) | |
| parent | c1724623ce0433c6a9ee72133b1fd4db75ec7193 (diff) | |
| download | ffmpeg-fd937866f7b7ae3303e8a78b1e9a48d853360d62.tar.gz | |
Merge commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193'
* commit 'c1724623ce0433c6a9ee72133b1fd4db75ec7193':
vdpau: have av_vdpau_bind_context() fail on unsupported flag
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/vdpau.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index 1827e1a4ad..c3a5ca00fd 100644 --- 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); |