Fix small typo in RGB32LE red-mask check CAPS-MERGE-3
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>
Wed, 17 Dec 2003 22:38:22 +0000 (22:38 +0000)
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>
Wed, 17 Dec 2003 22:38:22 +0000 (22:38 +0000)
Original commit message from CVS:
Fix small typo in RGB32LE red-mask check

common
ext/ffmpeg/gstffmpegcodecmap.c

diff --git a/common b/common
index fcdc6cc..cd5507a 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit fcdc6ccbcc674dd487021d87a0313abf02bae396
+Subproject commit cd5507ae3df8dc48c07df9e37878846b6b79faa1
index e4ae451..d18e18b 100644 (file)
@@ -521,7 +521,7 @@ gst_ffmpeg_pixfmt_to_caps (enum PixelFormat  pix_fmt,
       /* .. */
       break;
     case PIX_FMT_RGBA32:
-      bpp = depth = 32;
+      bpp = 32; depth = 24;
       endianness = G_BIG_ENDIAN;
 #if (G_BYTE_ORDER == G_BIG_ENDIAN)
       r_mask = 0x00ff0000; g_mask = 0x0000ff00; b_mask = 0x000000ff;
@@ -876,9 +876,9 @@ gst_ffmpeg_caps_to_pixfmt (GstCaps        *caps,
       switch (bpp) {
         case 32:
 #if (G_BYTE_ORDER == G_BIG_ENDIAN)
-          if (rmask == 0xff0000)
+          if (rmask == 0x00ff0000)
 #else
-          if (rmask == 0x0000ff)
+          if (rmask == 0x0000ff00)
 #endif
             context->pix_fmt = PIX_FMT_RGBA32;
           break;