changeset 27601:b519c68ec868

Fix mapping between MPlayer and FFmpeg colorspaces after libswscale changes. patch by Reimar
author diego
date Wed, 17 Sep 2008 20:23:41 +0000
parents 4a979c26d034
children 2de32a90d2dd
files fmt-conversion.h
diffstat 1 files changed, 10 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/fmt-conversion.h	Tue Sep 16 22:30:22 2008 +0000
+++ b/fmt-conversion.h	Wed Sep 17 20:23:41 2008 +0000
@@ -13,32 +13,32 @@
         case IMGFMT_BGR24:
             return PIX_FMT_BGR24;
         case IMGFMT_BGR16:
-            return PIX_FMT_BGR565;
+            return PIX_FMT_RGB565;
         case IMGFMT_BGR15:
-            return PIX_FMT_BGR555;
+            return PIX_FMT_RGB555;
         case IMGFMT_BGR8:
-            return PIX_FMT_BGR8;
+            return PIX_FMT_RGB8;
         case IMGFMT_BGR4:
-            return PIX_FMT_BGR4;
+            return PIX_FMT_RGB4;
         case IMGFMT_BGR1:
         case IMGFMT_RGB1:
             return PIX_FMT_MONOBLACK;
         case IMGFMT_RG4B:
-            return PIX_FMT_RGB4_BYTE;
+            return PIX_FMT_BGR4_BYTE;
         case IMGFMT_BG4B:
-            return PIX_FMT_BGR4_BYTE;
+            return PIX_FMT_RGB4_BYTE;
         case IMGFMT_RGB32:
             return PIX_FMT_BGR32;
         case IMGFMT_RGB24:
             return PIX_FMT_RGB24;
         case IMGFMT_RGB16:
-            return PIX_FMT_RGB565;
+            return PIX_FMT_BGR565;
         case IMGFMT_RGB15:
-            return PIX_FMT_RGB555;
+            return PIX_FMT_BGR555;
         case IMGFMT_RGB8:
-            return PIX_FMT_RGB8;
+            return PIX_FMT_BGR8;
         case IMGFMT_RGB4:
-            return PIX_FMT_RGB4;
+            return PIX_FMT_BGR4;
         case IMGFMT_YUY2:
             return PIX_FMT_YUYV422;
         case IMGFMT_UYVY: