Skip to content

Commit 5d5ebd6

Browse files
committed
lavc VUYA compat
use already existing VUYX_PRESENT (VUYA was added by 6ab8a9d3 in Jul 2022 a month earlier than VUYX)
1 parent 1ba9fbd commit 5d5ebd6

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/libavcodec/from_lavc_vid_conv.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2567,7 +2567,6 @@ static const struct av_to_uv_conversion av_to_uv_conversions[] = {
25672567
{AV_PIX_FMT_YUV422P, RGBA, yuv422p_to_rgb32},
25682568
{AV_PIX_FMT_YUV444P, v210, yuv444p_to_v210},
25692569
{AV_PIX_FMT_YUV444P, UYVY, yuv444p_to_uyvy},
2570-
{AV_PIX_FMT_YUV444P, VUYA, yuv444p_to_vuya},
25712570
{AV_PIX_FMT_YUV444P, RGB, yuv444p_to_rgb24},
25722571
{AV_PIX_FMT_YUV444P, RGBA, yuv444p_to_rgb32},
25732572
// 8-bit YUV - this should be supposedly full range JPEG but lavd decoder doesn't honor
@@ -2582,7 +2581,6 @@ static const struct av_to_uv_conversion av_to_uv_conversions[] = {
25822581
{AV_PIX_FMT_YUVJ422P, RGB, yuv422p_to_rgb24},
25832582
{AV_PIX_FMT_YUVJ422P, RGBA, yuv422p_to_rgb32},
25842583
{AV_PIX_FMT_YUVJ444P, v210, yuv444p_to_v210},
2585-
{AV_PIX_FMT_YUVJ444P, VUYA, yuv444p_to_vuya},
25862584
{AV_PIX_FMT_YUVJ444P, UYVY, yuv444p_to_uyvy},
25872585
{AV_PIX_FMT_YUVJ444P, RGB, yuv444p_to_rgb24},
25882586
{AV_PIX_FMT_YUVJ444P, RGBA, yuv444p_to_rgb32},
@@ -2591,6 +2589,8 @@ static const struct av_to_uv_conversion av_to_uv_conversions[] = {
25912589
{AV_PIX_FMT_VUYX, UYVY, vuya_to_uyvy},
25922590
{AV_PIX_FMT_VUYA, Y416, vuya_to_y416},
25932591
{AV_PIX_FMT_VUYX, Y416, vuyx_to_y416},
2592+
{AV_PIX_FMT_YUV444P, VUYA, yuv444p_to_vuya},
2593+
{AV_PIX_FMT_YUVJ444P, VUYA, yuv444p_to_vuya},
25942594
#endif
25952595
// 8-bit YUV (NV12)
25962596
{AV_PIX_FMT_NV12, UYVY, nv12_to_uyvy},

src/libavcodec/utils.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ static const struct uv_to_av_pixfmt uv_to_av_pixfmts[] = {
4646
{RGBA, AV_PIX_FMT_RGBA},
4747
{UYVY, AV_PIX_FMT_UYVY422},
4848
{YUYV,AV_PIX_FMT_YUYV422},
49+
#if VUYX_PRESENT
4950
{VUYA, AV_PIX_FMT_VUYA},
51+
#endif
5052
//R10k,
5153
//v210,
5254
//DVS10,

0 commit comments

Comments
 (0)