You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-10 06:10:52 +02:00
avcodec: remove deprecated FF_API_VDPAU_ALLOC_GET_SET
Deprecated since 2024-03-07. Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
@@ -62,20 +62,6 @@ static int vdpau_error(VdpStatus status)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if FF_API_VDPAU_ALLOC_GET_SET
|
|
||||||
AVVDPAUContext *av_alloc_vdpaucontext(void)
|
|
||||||
{
|
|
||||||
FF_DISABLE_DEPRECATION_WARNINGS
|
|
||||||
return av_vdpau_alloc_context();
|
|
||||||
FF_ENABLE_DEPRECATION_WARNINGS
|
|
||||||
}
|
|
||||||
|
|
||||||
#define MAKE_ACCESSORS(str, name, type, field) \
|
|
||||||
type av_##name##_get_##field(const str *s) { return s->field; } \
|
|
||||||
void av_##name##_set_##field(str *s, type v) { s->field = v; }
|
|
||||||
MAKE_ACCESSORS(AVVDPAUContext, vdpau_hwaccel, AVVDPAU_Render2, render2)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int av_vdpau_get_surface_parameters(AVCodecContext *avctx,
|
int av_vdpau_get_surface_parameters(AVCodecContext *avctx,
|
||||||
VdpChromaType *type,
|
VdpChromaType *type,
|
||||||
uint32_t *width, uint32_t *height)
|
uint32_t *width, uint32_t *height)
|
||||||
@@ -402,13 +388,6 @@ int ff_vdpau_add_buffer(struct vdpau_picture_context *pic_ctx,
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if FF_API_VDPAU_ALLOC_GET_SET
|
|
||||||
AVVDPAUContext *av_vdpau_alloc_context(void)
|
|
||||||
{
|
|
||||||
return av_mallocz(sizeof(VDPAUHWContext));
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int av_vdpau_bind_context(AVCodecContext *avctx, VdpDevice device,
|
int av_vdpau_bind_context(AVCodecContext *avctx, VdpDevice device,
|
||||||
VdpGetProcAddress *get_proc, unsigned flags)
|
VdpGetProcAddress *get_proc, unsigned flags)
|
||||||
{
|
{
|
||||||
|
@@ -93,28 +93,6 @@ typedef struct AVVDPAUContext {
|
|||||||
AVVDPAU_Render2 render2;
|
AVVDPAU_Render2 render2;
|
||||||
} AVVDPAUContext;
|
} AVVDPAUContext;
|
||||||
|
|
||||||
#if FF_API_VDPAU_ALLOC_GET_SET
|
|
||||||
/**
|
|
||||||
* @brief allocation function for AVVDPAUContext
|
|
||||||
*
|
|
||||||
* Allows extending the struct without breaking API/ABI
|
|
||||||
* @deprecated use av_vdpau_bind_context() instead
|
|
||||||
*/
|
|
||||||
attribute_deprecated
|
|
||||||
AVVDPAUContext *av_alloc_vdpaucontext(void);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @deprecated render2 is public and can be accessed directly
|
|
||||||
*/
|
|
||||||
attribute_deprecated
|
|
||||||
AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *);
|
|
||||||
/**
|
|
||||||
* @deprecated render2 is public and can be accessed directly
|
|
||||||
*/
|
|
||||||
attribute_deprecated
|
|
||||||
void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Associate a VDPAU device with a codec context for hardware acceleration.
|
* Associate a VDPAU device with a codec context for hardware acceleration.
|
||||||
* This function is meant to be called from the get_format() codec callback,
|
* This function is meant to be called from the get_format() codec callback,
|
||||||
@@ -155,17 +133,6 @@ int av_vdpau_bind_context(AVCodecContext *avctx, VdpDevice device,
|
|||||||
int av_vdpau_get_surface_parameters(AVCodecContext *avctx, VdpChromaType *type,
|
int av_vdpau_get_surface_parameters(AVCodecContext *avctx, VdpChromaType *type,
|
||||||
uint32_t *width, uint32_t *height);
|
uint32_t *width, uint32_t *height);
|
||||||
|
|
||||||
#if FF_API_VDPAU_ALLOC_GET_SET
|
|
||||||
/**
|
|
||||||
* Allocate an AVVDPAUContext.
|
|
||||||
*
|
|
||||||
* @return Newly-allocated AVVDPAUContext or NULL on failure.
|
|
||||||
* @deprecated use av_vdpau_bind_context() instead
|
|
||||||
*/
|
|
||||||
attribute_deprecated
|
|
||||||
AVVDPAUContext *av_vdpau_alloc_context(void);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/** @} */
|
/** @} */
|
||||||
|
|
||||||
#endif /* AVCODEC_VDPAU_H */
|
#endif /* AVCODEC_VDPAU_H */
|
||||||
|
@@ -39,7 +39,6 @@
|
|||||||
|
|
||||||
#define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 62)
|
#define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 62)
|
||||||
|
|
||||||
#define FF_API_VDPAU_ALLOC_GET_SET (LIBAVCODEC_VERSION_MAJOR < 62)
|
|
||||||
#define FF_API_QUALITY_FACTOR (LIBAVCODEC_VERSION_MAJOR < 62)
|
#define FF_API_QUALITY_FACTOR (LIBAVCODEC_VERSION_MAJOR < 62)
|
||||||
#define FF_API_V408_CODECID (LIBAVCODEC_VERSION_MAJOR < 62)
|
#define FF_API_V408_CODECID (LIBAVCODEC_VERSION_MAJOR < 62)
|
||||||
#define FF_API_CODEC_PROPS (LIBAVCODEC_VERSION_MAJOR < 63)
|
#define FF_API_CODEC_PROPS (LIBAVCODEC_VERSION_MAJOR < 63)
|
||||||
|
Reference in New Issue
Block a user