Merge commit 'e10b7ef2'

* commit 'e10b7ef2':
  vdpau: Add missing deprecation guards
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

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)
 {