Merge commit 'b9ece15a01782b4f301c0c139d1d7b20f848914c'

[ffmpeg] / libavcodec / vdpau.h

diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h
index 17cc2631b34e066cc7e9740f4854c02e51cdbe50..e85e4d9e9a26a5aaed20d9f0600ebe86d6d34ee2 100644 (file)
--- a/libavcodec/vdpau.h
+++ b/libavcodec/vdpau.h
@@ -196,10 +196,13 @@ int av_vdpau_get_surface_parameters(AVCodecContext *avctx, VdpChromaType *type,
  */
 AVVDPAUContext *av_vdpau_alloc_context(void);
 
+#if FF_API_VDPAU_PROFILE
 /**
  * Get a decoder profile that should be used for initializing a VDPAU decoder.
  * Should be called from the AVCodecContext.get_format() callback.
  *
+ * @deprecated Use av_vdpau_bind_context() instead.
+ *
  * @param avctx the codec context being used for decoding the stream
  * @param profile a pointer into which the result will be written on success.
  *                The contents of profile are undefined if this function returns
@@ -207,7 +210,9 @@ AVVDPAUContext *av_vdpau_alloc_context(void);
  *
  * @return 0 on success (non-negative), a negative AVERROR on failure.
  */
+attribute_deprecated
 int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile);
+#endif
 
 #if FF_API_CAP_VDPAU
 /** @brief The videoSurface is used for rendering. */