Use PIX_FMT_NE() for defining the PIX_FMT_RGB32 variants macros.

Originally committed as revision 18174 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago · 77544e5b91
parent 1cee4eafa3
commit 77544e5b91
1 changed files with 4 additions and 11 deletions
--- a/libavutil/pixfmt.h
+++ b/libavutil/pixfmt.h
@ -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)