From a12cd3be98e8aba6e74274192ec6532988aa9444 Mon Sep 17 00:00:00 2001 From: James Almer Date: Sat, 20 Jan 2024 10:58:57 -0300 Subject: [PATCH] avutil: remove deprecated FF_API_XVMC Signed-off-by: James Almer --- libavutil/pixdesc.c | 6 ------ libavutil/pixfmt.h | 4 ---- libavutil/version.h | 1 - 3 files changed, 11 deletions(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index f6d4d01460..9c708520b1 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -460,12 +460,6 @@ static const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { }, .flags = AV_PIX_FMT_FLAG_PLANAR, }, -#if FF_API_XVMC - [AV_PIX_FMT_XVMC] = { - .name = "xvmc", - .flags = AV_PIX_FMT_FLAG_HWACCEL, - }, -#endif [AV_PIX_FMT_UYVY422] = { .name = "uyvy422", .nb_components = 3, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 3ffba7c0d3..4aa20e4e58 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -295,10 +295,6 @@ enum AVPixelFormat { AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian -#if FF_API_XVMC - AV_PIX_FMT_XVMC,///< XVideo Motion Acceleration via common packet passing -#endif - AV_PIX_FMT_YUV440P10LE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian AV_PIX_FMT_YUV440P10BE, ///< planar YUV 4:4:0,20bpp, (1 Cr & Cb sample per 1x2 Y samples), big-endian AV_PIX_FMT_YUV440P12LE, ///< planar YUV 4:4:0,24bpp, (1 Cr & Cb sample per 1x2 Y samples), little-endian diff --git a/libavutil/version.h b/libavutil/version.h index ff998da987..030ec41c01 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -105,7 +105,6 @@ * @{ */ -#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_OLD_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_AV_FOPEN_UTF8 (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_PKT_DURATION (LIBAVUTIL_VERSION_MAJOR < 59)