From 08628b6afbc9b708b46f871f25a7a6be76ba4337 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Thu, 26 Jan 2012 18:06:57 -0800 Subject: Revert "sws/pixfmt/pixdesc: add support for yuva444p" This reverts commit fc115c80b7bf6f1f5a937ee7f6e14630d99eb4dd. Tests are broken. --- libavutil/avutil.h | 2 +- libavutil/pixdesc.c | 13 ------------- libavutil/pixfmt.h | 1 - libswscale/utils.c | 1 - tests/ref/lavfi/pixdesc | 1 - tests/ref/lavfi/pixfmts_copy | 1 - tests/ref/lavfi/pixfmts_null | 1 - tests/ref/lavfi/pixfmts_scale | 1 - tests/ref/lavfi/pixfmts_vflip | 1 - 9 files changed, 1 insertion(+), 21 deletions(-) diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 0e62b4a13f..f0be5c110a 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -154,7 +154,7 @@ */ #define LIBAVUTIL_VERSION_MAJOR 51 -#define LIBAVUTIL_VERSION_MINOR 22 +#define LIBAVUTIL_VERSION_MINOR 21 #define LIBAVUTIL_VERSION_MICRO 0 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index eeab7a76ed..6e1f23b97f 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -521,19 +521,6 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[PIX_FMT_NB] = { }, .flags = PIX_FMT_PLANAR, }, - [PIX_FMT_YUVA444P] = { - .name = "yuva444p", - .nb_components = 4, - .log2_chroma_w = 0, - .log2_chroma_h = 0, - .comp = { - { 0, 0, 1, 0, 7 }, /* Y */ - { 1, 0, 1, 0, 7 }, /* U */ - { 2, 0, 1, 0, 7 }, /* V */ - { 3, 0, 1, 0, 7 }, /* A */ - }, - .flags = PIX_FMT_PLANAR, - }, [PIX_FMT_VDPAU_H264] = { .name = "vdpau_h264", .log2_chroma_w = 1, diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 7d1d291e05..bd898bdc8e 100644 --- a/libavutil/pixfmt.h +++ b/libavutil/pixfmt.h @@ -157,7 +157,6 @@ enum PixelFormat { PIX_FMT_GBRP10LE, ///< planar GBR 4:4:4 30bpp, little endian PIX_FMT_GBRP16BE, ///< planar GBR 4:4:4 48bpp, big endian PIX_FMT_GBRP16LE, ///< planar GBR 4:4:4 48bpp, little endian - PIX_FMT_YUVA444P, ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples) PIX_FMT_NB, ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions }; diff --git a/libswscale/utils.c b/libswscale/utils.c index 3d94499986..b49f924244 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -104,7 +104,6 @@ static const FormatEntry format_entries[PIX_FMT_NB] = { [PIX_FMT_YUV440P] = { 1 , 1 }, [PIX_FMT_YUVJ440P] = { 1 , 1 }, [PIX_FMT_YUVA420P] = { 1 , 1 }, - [PIX_FMT_YUVA444P] = { 1 , 1 }, [PIX_FMT_RGB48BE] = { 1 , 1 }, [PIX_FMT_RGB48LE] = { 1 , 1 }, [PIX_FMT_RGB565BE] = { 1 , 1 }, diff --git a/tests/ref/lavfi/pixdesc b/tests/ref/lavfi/pixdesc index 3d6efeafef..5dfa270021 100644 --- a/tests/ref/lavfi/pixdesc +++ b/tests/ref/lavfi/pixdesc @@ -57,7 +57,6 @@ yuv444p16le 20f86bc2f68d2b3f1f2b48b97b2189f4 yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 yuv444p9le f0606604a5c08becab6ba500124c4b7c yuva420p a29884f3f3dfe1e00b961bc17bef3d47 -yuva444p bc92270d1b97ba23a9640d806daa7b07 yuvj420p 32eec78ba51857b16ce9b813a49b7189 yuvj422p 0dfa0ed434f73be51428758c69e082cb yuvj440p 657501a28004e27a592757a7509f5189 diff --git a/tests/ref/lavfi/pixfmts_copy b/tests/ref/lavfi/pixfmts_copy index 3d6efeafef..5dfa270021 100644 --- a/tests/ref/lavfi/pixfmts_copy +++ b/tests/ref/lavfi/pixfmts_copy @@ -57,7 +57,6 @@ yuv444p16le 20f86bc2f68d2b3f1f2b48b97b2189f4 yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 yuv444p9le f0606604a5c08becab6ba500124c4b7c yuva420p a29884f3f3dfe1e00b961bc17bef3d47 -yuva444p bc92270d1b97ba23a9640d806daa7b07 yuvj420p 32eec78ba51857b16ce9b813a49b7189 yuvj422p 0dfa0ed434f73be51428758c69e082cb yuvj440p 657501a28004e27a592757a7509f5189 diff --git a/tests/ref/lavfi/pixfmts_null b/tests/ref/lavfi/pixfmts_null index 3d6efeafef..5dfa270021 100644 --- a/tests/ref/lavfi/pixfmts_null +++ b/tests/ref/lavfi/pixfmts_null @@ -57,7 +57,6 @@ yuv444p16le 20f86bc2f68d2b3f1f2b48b97b2189f4 yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 yuv444p9le f0606604a5c08becab6ba500124c4b7c yuva420p a29884f3f3dfe1e00b961bc17bef3d47 -yuva444p bc92270d1b97ba23a9640d806daa7b07 yuvj420p 32eec78ba51857b16ce9b813a49b7189 yuvj422p 0dfa0ed434f73be51428758c69e082cb yuvj440p 657501a28004e27a592757a7509f5189 diff --git a/tests/ref/lavfi/pixfmts_scale b/tests/ref/lavfi/pixfmts_scale index 1fdd909fba..4a5bf676d9 100644 --- a/tests/ref/lavfi/pixfmts_scale +++ b/tests/ref/lavfi/pixfmts_scale @@ -57,7 +57,6 @@ yuv444p16le a0c5d3c7bf3f181db503cf8e450d1335 yuv444p9be 9ac2643ce7f7e5c4e17c8c9fd8494d4a yuv444p9le 896a1cc9cccca1ba410dd53942d33cc4 yuva420p 8673a9131fb47de69788863f93a50eb7 -yuva444p d74a2339d1973fb25e53efc2102f8a08 yuvj420p 30427bd6caf5bda93a173dbebe759e09 yuvj422p fc8288f64fd149573f73cf8da05d8e6d yuvj440p 508ac7a9ddeb6d1794a1100ba7a1664c diff --git a/tests/ref/lavfi/pixfmts_vflip b/tests/ref/lavfi/pixfmts_vflip index cec9e1508e..f21927bdad 100644 --- a/tests/ref/lavfi/pixfmts_vflip +++ b/tests/ref/lavfi/pixfmts_vflip @@ -57,7 +57,6 @@ yuv444p16le 8e83323cf102d6c823a03ae8a7b7e033 yuv444p9be 6ac92b7dc9ab2fc59bee99204886899a yuv444p9le 85aef13a654953d3455d89770b0d74bd yuva420p c705d1cf061d8c6580ac690b55f92276 -yuva444p 8ed70261961cf596e7b80e89b1ed2b08 yuvj420p 41fd02b204da0ab62452cd14b595e2e4 yuvj422p 7f6ca9bc1812cde02036d7d29a7cce43 yuvj440p 25711c3c0fd15ec19c59a10784fcfb96 -- cgit v1.2.3