har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'b10b6ac7a902f28e09e37a29c392e2f0c19e9526'

Browse Source 
* commit 'b10b6ac7a902f28e09e37a29c392e2f0c19e9526':
  vdpau: deprecate av_vdpau_get_profile()

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-09-29 13:44:59 +02:00
commit b123d82c41
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/vdpau.h
View File

@ -196,10 +196,13 @@ int av_vdpau_get_surface_parameters(AVCodecContext *avctx, VdpChromaType *type,
*/ */
AVVDPAUContext *av_vdpau_alloc_context(void); AVVDPAUContext *av_vdpau_alloc_context(void);
#if FF_API_VDPAU_PROFILE
/** /**
* Get a decoder profile that should be used for initializing a VDPAU decoder. * Get a decoder profile that should be used for initializing a VDPAU decoder.
* Should be called from the AVCodecContext.get_format() callback. * 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 avctx the codec context being used for decoding the stream
* @param profile a pointer into which the result will be written on success. * @param profile a pointer into which the result will be written on success.
* The contents of profile are undefined if this function returns * 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. * @return 0 on success (non-negative), a negative AVERROR on failure.
*/ */
attribute_deprecated
int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile); int av_vdpau_get_profile(AVCodecContext *avctx, VdpDecoderProfile *profile);
#endif
#if FF_API_CAP_VDPAU #if FF_API_CAP_VDPAU
/** @brief The videoSurface is used for rendering. */ /** @brief The videoSurface is used for rendering. */

3
libavcodec/version.h
View File

@ -182,5 +182,8 @@
#ifndef FF_API_SIDEDATA_ONLY_PKT #ifndef FF_API_SIDEDATA_ONLY_PKT
#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59) #define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59)
#endif #endif
#ifndef FF_API_VDPAU_PROFILE
#define FF_API_VDPAU_PROFILE (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#endif /* AVCODEC_VERSION_H */ #endif /* AVCODEC_VERSION_H */