From 5f43c89d8b6f551c98c3c46af2f994a291188f35 Mon Sep 17 00:00:00 2001
From: stefano <stefano@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sat, 6 Mar 2010 11:50:54 +0000
Subject: Avoid duplication of usePal() macro.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30856 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 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 ab77537ff2..0b1faa1f4b 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 aebe30e1cf..5be17d4abb 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 fbd44bcc3c..1674d764e5 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)
-- 
cgit v1.2.3