diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 14:44:59 +0300 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-09-29 14:44:59 +0300 |
| commit | b123d82c4182fc3842376ac1e078ec63bcd2e20c (patch) | |
| tree | 69c59ad4afd9cafbd5372a16b288447d72ee3675 /libavcodec/vdpau.h | |
| parent | 1b82b934a166e60f64e966eaa97512ba9dcb615b (diff) | |
| parent | b10b6ac7a902f28e09e37a29c392e2f0c19e9526 (diff) | |
Merge commit 'b10b6ac7a902f28e09e37a29c392e2f0c19e9526'
* commit 'b10b6ac7a902f28e09e37a29c392e2f0c19e9526':
vdpau: deprecate av_vdpau_get_profile()
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/vdpau.h')
| -rw-r--r-- | libavcodec/vdpau.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/vdpau.h b/libavcodec/vdpau.h index 17cc2631b3..e85e4d9e9a 100644 --- 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. */ |