swscale: remove unused is{RGB,BGR}inBytes

diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index ea5df26a2734d07d4596f6ca7e17714da764631a..d5674227ed21518c5fd72d339f0b8e2f4a7cf900 100644 (file)
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -741,25 +741,6 @@ static av_always_inline int isGray(enum AVPixelFormat pix_fmt)
      (x) == AV_PIX_FMT_MONOWHITE   \
     )
 
-#define isRGBinBytes(x) (           \
-           (x) == AV_PIX_FMT_RGB48BE     \
-        || (x) == AV_PIX_FMT_RGB48LE     \
-        || (x) == AV_PIX_FMT_RGBA64BE    \
-        || (x) == AV_PIX_FMT_RGBA64LE    \
-        || (x) == AV_PIX_FMT_RGBA        \
-        || (x) == AV_PIX_FMT_ARGB        \
-        || (x) == AV_PIX_FMT_RGB24       \
-    )
-#define isBGRinBytes(x) (           \
-           (x) == AV_PIX_FMT_BGR48BE     \
-        || (x) == AV_PIX_FMT_BGR48LE     \
-        || (x) == AV_PIX_FMT_BGRA64BE    \
-        || (x) == AV_PIX_FMT_BGRA64LE    \
-        || (x) == AV_PIX_FMT_BGRA        \
-        || (x) == AV_PIX_FMT_ABGR        \
-        || (x) == AV_PIX_FMT_BGR24       \
-    )
-
 static av_always_inline int isBayer(enum AVPixelFormat pix_fmt)
 {
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt);

diff --git a/libswscale/tests/pixdesc_query.c b/libswscale/tests/pixdesc_query.c
index bc49809d4b533740017a4d7dced9a0a08f48c5bb..9591b04da69c527c9bf9a823af11ffdb6c24ffd6 100644 (file)
--- a/libswscale/tests/pixdesc_query.c
+++ b/libswscale/tests/pixdesc_query.c
@@ -36,8 +36,6 @@ DECLARE_WRAPPER(isRGB)
 DECLARE_WRAPPER(isGray)
 DECLARE_WRAPPER(isRGBinInt)
 DECLARE_WRAPPER(isBGRinInt)
-DECLARE_WRAPPER(isRGBinBytes)
-DECLARE_WRAPPER(isBGRinBytes)
 DECLARE_WRAPPER(isBayer)
 DECLARE_WRAPPER(isAnyRGB)
 DECLARE_WRAPPER(isALPHA)
@@ -60,8 +58,6 @@ static const struct {
     {"Gray",        isGray_func},
     {"RGBinInt",    isRGBinInt_func},
     {"BGRinInt",    isBGRinInt_func},
-    {"RGBinBytes",  isRGBinBytes_func},
-    {"BGRinBytes",  isBGRinBytes_func},
     {"Bayer",       isBayer_func},
     {"AnyRGB",      isAnyRGB_func},
     {"ALPHA",       isALPHA_func},

diff --git a/tests/ref/fate/sws-pixdesc-query b/tests/ref/fate/sws-pixdesc-query
index d23b4f5a11a299622f521549a2c11729e4362e49..e262a0cabff4160741da2748c273ac8b8a8c961a 100644 (file)
--- a/tests/ref/fate/sws-pixdesc-query
+++ b/tests/ref/fate/sws-pixdesc-query
@@ -440,24 +440,6 @@ BGRinInt:
   bgra64be
   bgra64le
 
-RGBinBytes:
-  rgb24
-  argb
-  rgba
-  rgb48be
-  rgb48le
-  rgba64be
-  rgba64le
-
-BGRinBytes:
-  bgr24
-  abgr
-  bgra
-  bgr48be
-  bgr48le
-  bgra64be
-  bgra64le
-
 Bayer:
   bayer_bggr8
   bayer_rggb8