[FFmpeg-cvslog] r18174 - trunk/libavutil/pixfmt.h

stefano subversion
Tue Mar 24 00:01:11 CET 2009


Author: stefano
Date: Tue Mar 24 00:01:11 2009
New Revision: 18174

Log:
Use PIX_FMT_NE() for defining the PIX_FMT_RGB32 variants macros.

Modified:
   trunk/libavutil/pixfmt.h

Modified: trunk/libavutil/pixfmt.h
==============================================================================
--- trunk/libavutil/pixfmt.h	Mon Mar 23 23:57:55 2009	(r18173)
+++ trunk/libavutil/pixfmt.h	Tue Mar 24 00:01:11 2009	(r18174)
@@ -125,17 +125,10 @@ enum PixelFormat {
 #   define PIX_FMT_NE(be, le) PIX_FMT_##le
 #endif
 
-#ifdef WORDS_BIGENDIAN
-#define PIX_FMT_RGB32   PIX_FMT_ARGB
-#define PIX_FMT_RGB32_1 PIX_FMT_RGBA
-#define PIX_FMT_BGR32   PIX_FMT_ABGR
-#define PIX_FMT_BGR32_1 PIX_FMT_BGRA
-#else
-#define PIX_FMT_RGB32   PIX_FMT_BGRA
-#define PIX_FMT_RGB32_1 PIX_FMT_ABGR
-#define PIX_FMT_BGR32   PIX_FMT_RGBA
-#define PIX_FMT_BGR32_1 PIX_FMT_ARGB
-#endif
+#define PIX_FMT_RGB32   PIX_FMT_NE(ARGB, BGRA)
+#define PIX_FMT_RGB32_1 PIX_FMT_NE(RGBA, ABGR)
+#define PIX_FMT_BGR32   PIX_FMT_NE(ABGR, RGBA)
+#define PIX_FMT_BGR32_1 PIX_FMT_NE(BGRA, ARGB)
 
 #define PIX_FMT_GRAY16 PIX_FMT_NE(GRAY16BE, GRAY16LE)
 #define PIX_FMT_RGB48  PIX_FMT_NE(RGB48BE,  RGB48LE)



More information about the ffmpeg-cvslog mailing list