aboutsummaryrefslogtreecommitdiffstats
path: root/libswscale/swscale_internal.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2010-01-26 07:40:14 +0000
committerMichael Niedermayer <michaelni@gmx.at>2010-01-26 07:40:14 +0000
commit3b1ee70312c9a363411a2beb4ee5a5ac105e2fc0 (patch)
treebe82159d1e5e0f329c82bc01911bc9c517460832 /libswscale/swscale_internal.h
parent7b87519b323751d391318d9bbfa1e7bbf5f1e7fb (diff)
downloadffmpeg-3b1ee70312c9a363411a2beb4ee5a5ac105e2fc0.tar.gz
Rename isRGB() and isBGR() as their meaning is confusing.
Originally committed as revision 30433 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
Diffstat (limited to 'libswscale/swscale_internal.h')
-rw-r--r--libswscale/swscale_internal.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h
index aba4de25ff..b159d8f696 100644
--- a/libswscale/swscale_internal.h
+++ b/libswscale/swscale_internal.h
@@ -385,7 +385,7 @@ const char *sws_format_name(enum PixelFormat format);
(x)==PIX_FMT_GRAY16BE \
|| (x)==PIX_FMT_GRAY16LE \
)
-#define isRGB(x) ( \
+#define isRGBinInt(x) ( \
(x)==PIX_FMT_RGB48BE \
|| (x)==PIX_FMT_RGB48LE \
|| (x)==PIX_FMT_RGB32 \
@@ -399,7 +399,7 @@ const char *sws_format_name(enum PixelFormat format);
|| (x)==PIX_FMT_MONOBLACK \
|| (x)==PIX_FMT_MONOWHITE \
)
-#define isBGR(x) ( \
+#define isBGRinInt(x) ( \
(x)==PIX_FMT_BGR32 \
|| (x)==PIX_FMT_BGR32_1 \
|| (x)==PIX_FMT_BGR24 \