From 3de42635bdb4b807910c53cb416625f843f92ad5 Mon Sep 17 00:00:00 2001
From: Stefano Sabatini <stefano.sabatini-lala@poste.it>
Date: Sat, 6 Mar 2010 11:50:54 +0000
Subject: [PATCH] Avoid duplication of usePal() macro.
Originally committed as revision 30856 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
---
libswscale/swscale.c | 1 -
libswscale/swscale_internal.h | 1 +
libswscale/utils.c | 2 --
3 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/libswscale/swscale.c b/libswscale/swscale.c
index ab77537ff25..0b1faa1f4b8 100644
--- a/libswscale/swscale.c
+++ b/libswscale/swscale.c
@@ -92,7 +92,6 @@ untested special converters
|| (x)==PIX_FMT_UYVY422 \
|| isAnyRGB(x) \
)
-#define usePal(x) (av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL)
#define RGB2YUV_SHIFT 15
#define BY ( (int)(0.114*219/255*(1<<RGB2YUV_SHIFT)+0.5))
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index aebe30e1cf7..5be17d4abb2 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -442,6 +442,7 @@ const char *sws_format_name(enum PixelFormat format);
|| (x)==PIX_FMT_RGB32_1 \
|| (x)==PIX_FMT_YUVA420P \
)
+#define usePal(x) (av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL)
extern const uint64_t ff_dither4[2];
extern const uint64_t ff_dither8[2];
diff --git a/libswscale/utils.c b/libswscale/utils.c
index fbd44bcc3c9..1674d764e5d 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -150,8 +150,6 @@ int sws_isSupportedOutput(enum PixelFormat pix_fmt)
return isSupportedOut(pix_fmt);
}
-#define usePal(x) (av_pix_fmt_descriptors[x].flags & PIX_FMT_PAL)
-
extern const int32_t ff_yuv2rgb_coeffs[8][4];
const char *sws_format_name(enum PixelFormat format)
--
GitLab