diff options
| author | Rémi Denis-Courmont <remi@remlab.net> | 2015-09-27 13:49:09 +0300 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-09-28 09:45:58 +0200 |
| commit | b10b6ac7a902f28e09e37a29c392e2f0c19e9526 (patch) | |
| tree | 58c3064c1625ef4883744a617d824d96071ab035 /libavcodec | |
| parent | b2417ee6d1ee0c5e9b170a642d73bdf68908966f (diff) | |
| download | ffmpeg-b10b6ac7a902f28e09e37a29c392e2f0c19e9526.tar.gz | |
vdpau: deprecate av_vdpau_get_profile()
This function can intrinsically not deal with codec profile fallback
(for H.264 Constrained Baseline especially), and was made redundant
by av_vdpau_bind_context().
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/vdpau.h | 5 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 4e5c3518e3..d25ee1ce17 100644 --- a/libavcodec/vdpau.h +++ b/libavcodec/vdpau.h @@ -177,10 +177,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 @@ -188,7 +191,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. */ diff --git a/libavcodec/version.h b/libavcodec/version.h index ecd6e1d1ea..c704d44b7a 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -165,5 +165,8 @@ #ifndef FF_API_SIDEDATA_ONLY_PKT #define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59) #endif +#ifndef FF_API_VDPAU_PROFILE +#define FF_API_VDPAU_PROFILE (LIBAVCODEC_VERSION_MAJOR < 59) +#endif #endif /* AVCODEC_VERSION_H */ |