diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-09-04 20:16:41 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-09-04 20:16:41 +0000 |
| commit | d52337af7052e0562f0c4c3d5c4b747960fd16f9 (patch) | |
| tree | 858462189b3076cf6bf6b0c8a88a6950490c2c41 | |
| parent | 7372e9bbe5380ee8c95464fc6f48cbd4939ac72b (diff) | |
| download | ffmpeg-d52337af7052e0562f0c4c3d5c4b747960fd16f9.tar.gz | |
Remove workaround for rgb/bgr mess.
Originally committed as revision 27520 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
| -rw-r--r-- | libswscale/swscale_internal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index a20b26ef5a..a14e85cf30 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -221,7 +221,7 @@ const char *sws_format_name(int format); || (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 @@ const char *sws_format_name(int format); || (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 \ |