From e5ad74f116826df562df7337ebe71afd163a64f0 Mon Sep 17 00:00:00 2001 From: stefano Date: Mon, 23 Mar 2009 23:01:11 +0000 Subject: [PATCH] Use PIX_FMT_NE() for defining the PIX_FMT_RGB32 variants macros. git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18174 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b --- libavutil/pixfmt.h | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/libavutil/pixfmt.h b/libavutil/pixfmt.h index 0a761ee17..21a72a845 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) -- 2.39.2