when we don't have 0RGB/BGR0, map those to ARGB/BGRA and don't disabl…

…e the rest of the rgb modes (oops) git-svn-id: https://xpra.org/svn/Xpra/trunk@4101 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Aug 8, 2013 · 6c548e9 · 6c548e9
1 parent 3d94029
commit 6c548e9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 30 deletions.
diff --git a/debian/patches/old-libav-no0RGB.patch b/debian/patches/old-libav-no0RGB.patch
@@ -47,22 +47,15 @@ Index: xpra/codecs/dec_avcodec/decoder.pyx b/xpra/codecs/dec_avcodec/decoder.pyx
 ===================================================================
 --- a/xpra/codecs/dec_avcodec/decoder.pyx	2013-08-08 15:46:25.160461837 +0700
 +++ b/xpra/codecs/dec_avcodec/decoder.pyx	2013-08-08 15:47:20.451796824 +0700
-@@ -108,12 +108,12 @@
-             "YUV420P"   : "PIX_FMT_YUV420P",
+@@ -109,8 +109,8 @@
              "YUV422P"   : "PIX_FMT_YUV422P",
              "YUV444P"   : "PIX_FMT_YUV444P",        
--            "RGB"       : "PIX_FMT_RGB24",
+             "RGB"       : "PIX_FMT_RGB24",
 -            "XRGB"      : "PIX_FMT_0RGB",
 -            "BGRX"      : "PIX_FMT_BGR0",
--            "ARGB"      : "PIX_FMT_ARGB",
--            "BGRA"      : "PIX_FMT_BGRA",
--            "GBRP"      : "PIX_FMT_GBRP",
-+            #"RGB"       : "PIX_FMT_RGB24",
-+            #"XRGB"      : "PIX_FMT_0RGB",
-+            #"BGRX"      : "PIX_FMT_BGR0",
-+            #"ARGB"      : "PIX_FMT_ARGB",
-+            #"BGRA"      : "PIX_FMT_BGRA",
-+            #"GBRP"      : "PIX_FMT_GBRP",
-          }.items():
-         if av_enum_str not in const:
-             debug("colorspace format %s (%s) not supported by avcodec", pix_fmt, av_enum_str)
++            "XRGB"      : "PIX_FMT_ARGB",
++            "BGRX"      : "PIX_FMT_BGRA",
+             "ARGB"      : "PIX_FMT_ARGB",
+             "BGRA"      : "PIX_FMT_BGRA",
+             "GBRP"      : "PIX_FMT_GBRP",
+
diff --git a/src/patches/old-libav-no0RGB.patch b/src/patches/old-libav-no0RGB.patch
@@ -47,22 +47,15 @@ Index: xpra/codecs/dec_avcodec/decoder.pyx b/xpra/codecs/dec_avcodec/decoder.pyx
 ===================================================================
 --- a/xpra/codecs/dec_avcodec/decoder.pyx	2013-08-08 15:46:25.160461837 +0700
 +++ b/xpra/codecs/dec_avcodec/decoder.pyx	2013-08-08 15:47:20.451796824 +0700
-@@ -108,12 +108,12 @@
-             "YUV420P"   : "PIX_FMT_YUV420P",
+@@ -109,8 +109,8 @@
              "YUV422P"   : "PIX_FMT_YUV422P",
              "YUV444P"   : "PIX_FMT_YUV444P",        
--            "RGB"       : "PIX_FMT_RGB24",
+             "RGB"       : "PIX_FMT_RGB24",
 -            "XRGB"      : "PIX_FMT_0RGB",
 -            "BGRX"      : "PIX_FMT_BGR0",
--            "ARGB"      : "PIX_FMT_ARGB",
--            "BGRA"      : "PIX_FMT_BGRA",
--            "GBRP"      : "PIX_FMT_GBRP",
-+            #"RGB"       : "PIX_FMT_RGB24",
-+            #"XRGB"      : "PIX_FMT_0RGB",
-+            #"BGRX"      : "PIX_FMT_BGR0",
-+            #"ARGB"      : "PIX_FMT_ARGB",
-+            #"BGRA"      : "PIX_FMT_BGRA",
-+            #"GBRP"      : "PIX_FMT_GBRP",
-          }.items():
-         if av_enum_str not in const:
-             debug("colorspace format %s (%s) not supported by avcodec", pix_fmt, av_enum_str)
++            "XRGB"      : "PIX_FMT_ARGB",
++            "BGRX"      : "PIX_FMT_BGRA",
+             "ARGB"      : "PIX_FMT_ARGB",
+             "BGRA"      : "PIX_FMT_BGRA",
+             "GBRP"      : "PIX_FMT_GBRP",
+