From 77544e5b910d4497c4de6755c6cd5cecf1634361 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Mon, 23 Mar 2009 23:01:11 +0000 Subject: Use PIX_FMT_NE() for defining the PIX_FMT_RGB32 variants macros. Originally committed as revision 18174 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/pixfmt.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to 'libavutil/pixfmt.h') diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 0a761ee172..21a72a8451 100644 --- 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) -- cgit v1.2.3