From 92b099daf4b8ef93513e38b43899cb8458a2fde3 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Mon, 7 Apr 2014 17:19:53 +0200 Subject: swscale: support converting YVYU422 pixel format --- libswscale/output.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'libswscale/output.c') diff --git a/libswscale/output.c b/libswscale/output.c index e1d01b0f40..125d998836 100644 --- a/libswscale/output.c +++ b/libswscale/output.c @@ -450,7 +450,12 @@ YUV2PACKEDWRAPPER(yuv2mono,, black, AV_PIX_FMT_MONOBLACK) dest[pos + 1] = U; \ dest[pos + 2] = Y2; \ dest[pos + 3] = V; \ - } else { \ + } else if (target == AV_PIX_FMT_YVYU422) { \ + dest[pos + 0] = Y1; \ + dest[pos + 1] = V; \ + dest[pos + 2] = Y2; \ + dest[pos + 3] = U; \ + } else { /* AV_PIX_FMT_UYVY422 */ \ dest[pos + 0] = U; \ dest[pos + 1] = Y1; \ dest[pos + 2] = V; \ @@ -569,6 +574,7 @@ yuv2422_1_c_template(SwsContext *c, const int16_t *buf0, #undef output_pixels YUV2PACKEDWRAPPER(yuv2, 422, yuyv422, AV_PIX_FMT_YUYV422) +YUV2PACKEDWRAPPER(yuv2, 422, yvyu422, AV_PIX_FMT_YVYU422) YUV2PACKEDWRAPPER(yuv2, 422, uyvy422, AV_PIX_FMT_UYVY422) #define R_B ((target == AV_PIX_FMT_RGB48LE || target == AV_PIX_FMT_RGB48BE) ? R : B) @@ -1576,6 +1582,11 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c, *yuv2packed2 = yuv2yuyv422_2_c; *yuv2packedX = yuv2yuyv422_X_c; break; + case AV_PIX_FMT_YVYU422: + *yuv2packed1 = yuv2yvyu422_1_c; + *yuv2packed2 = yuv2yvyu422_2_c; + *yuv2packedX = yuv2yvyu422_X_c; + break; case AV_PIX_FMT_UYVY422: *yuv2packed1 = yuv2uyvy422_1_c; *yuv2packed2 = yuv2uyvy422_2_c; -- cgit v1.2.3