# HG changeset patch # User michael # Date 1220559401 0 # Node ID 92479ee7ad6e4eeedcc881e436ce2b64b9a43932 # Parent 31ac930fd1d49133cefeb773f17e5b0d7805fcd0 Remove workaround for rgb/bgr mess. diff -r 31ac930fd1d4 -r 92479ee7ad6e libswscale/swscale_internal.h --- a/libswscale/swscale_internal.h Thu Sep 04 19:49:13 2008 +0000 +++ b/libswscale/swscale_internal.h Thu Sep 04 20:16:41 2008 +0000 @@ -221,7 +221,7 @@ || (x)==PIX_FMT_GRAY16LE \ ) #define isRGB(x) ( \ - (x)==PIX_FMT_BGR32 \ + (x)==PIX_FMT_RGB32 \ || (x)==PIX_FMT_RGB24 \ || (x)==PIX_FMT_RGB565 \ || (x)==PIX_FMT_RGB555 \ @@ -231,7 +231,7 @@ || (x)==PIX_FMT_MONOBLACK \ ) #define isBGR(x) ( \ - (x)==PIX_FMT_RGB32 \ + (x)==PIX_FMT_BGR32 \ || (x)==PIX_FMT_BGR24 \ || (x)==PIX_FMT_BGR565 \ || (x)==PIX_FMT_BGR555 \