diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-13 16:22:14 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-13 16:22:14 +0100 |
| commit | 09dc6845662b74edb310c2088ffa4bb07c24fd76 (patch) | |
| tree | da0ea0942aaa384c3f0684efc201f9db7e0b5f53 /libavcodec | |
| parent | feb1f7abc5873e2be6143c94e423315b57a159ef (diff) | |
| parent | e10b7ef2fe56603fb1baac6b20fd6bd0a3fdd0d0 (diff) | |
| download | ffmpeg-streaming-09dc6845662b74edb310c2088ffa4bb07c24fd76.zip ffmpeg-streaming-09dc6845662b74edb310c2088ffa4bb07c24fd76.tar.gz | |
Merge commit 'e10b7ef2fe56603fb1baac6b20fd6bd0a3fdd0d0'
* commit 'e10b7ef2fe56603fb1baac6b20fd6bd0a3fdd0d0':
vdpau: Add missing deprecation guards
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vdpau.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c index a01c445..7f8690e 100644 --- a/libavcodec/vdpau.c +++ b/libavcodec/vdpau.c @@ -694,6 +694,7 @@ void ff_vdpau_mpeg4_decode_picture(Mpeg4DecContext *ctx, const uint8_t *buf, #endif /* CONFIG_MPEG4_VDPAU_DECODER */ #endif /* FF_API_VDPAU */ +#if FF_API_VDPAU_PROFILE int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile) { #define PROFILE(prof) \ @@ -740,6 +741,7 @@ do { \ return AVERROR(EINVAL); #undef PROFILE } +#endif /* FF_API_VDPAU_PROFILE */ AVVDPAUContext *av_vdpau_alloc_context(void) { |
