diff options
| author | Anton Khirnov <anton@khirnov.net> | 2022-02-01 10:46:16 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2022-02-15 10:16:16 +0100 |
| commit | cefa595361db9d934b52ea7870fd14a4e7110eb1 (patch) | |
| tree | 22780ca5c0b6942324ec39ca5039d4014cc5f4ad | |
| parent | 41d25efade20b20d06d64c2eb7751b70653518e8 (diff) | |
| download | ffmpeg-cefa595361db9d934b52ea7870fd14a4e7110eb1.tar.gz | |
lavu/pixfmt: deprecate AV_PIX_FMT_XVMC
It is no longer used for anything.
| -rw-r--r-- | libavutil/pixdesc.c | 2 | ||||
| -rw-r--r-- | libavutil/pixfmt.h | 2 | ||||
| -rw-r--r-- | libavutil/version.h | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 727d7540b3..6e57a82cb6 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -432,10 +432,12 @@ 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 66913f606b..2d3927cc3f 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -260,7 +260,9 @@ 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 diff --git a/libavutil/version.h b/libavutil/version.h index a9c9bc6c82..72f55ef3b3 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -111,6 +111,7 @@ #define FF_API_AV_MALLOCZ_ARRAY (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_FIFO_PEEK2 (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_FIFO_OLD_API (LIBAVUTIL_VERSION_MAJOR < 58) +#define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 58) /** * @} |