]> git.sesse.net Git - vlc/commitdiff
* Modification du module gnome pour l'output sous Xfree4 (detection
authorStéphane Borel <stef@videolan.org>
Wed, 18 Oct 2000 02:42:43 +0000 (02:42 +0000)
committerStéphane Borel <stef@videolan.org>
Wed, 18 Oct 2000 02:42:43 +0000 (02:42 +0000)
16bits).

plugins/gnome/vout_gnome.c

index c9335b16d0b1e2787b774b8b401dfb218db15765..75c0da19a77ae8570b73e66470b309752945d682 100644 (file)
@@ -411,11 +411,18 @@ static int X11OpenDisplay( vout_thread_t *p_vout, char *psz_display, Window root
          * formats. */
         p_xpixmap_format = XListPixmapFormats( p_vout->p_sys->p_display, &i_count );
         p_vout->i_bytes_per_pixel = 0;
+
+        /* Under XFree 4, XListPixmapFormats returns a list of available
+         * formats under each screen depth ; so we have to select the one
+         * for the current display. */
         for( ; i_count--; p_xpixmap_format++ )
         {
-            if( p_xpixmap_format->bits_per_pixel / 8 > p_vout->i_bytes_per_pixel )
+            if( p_vout->i_screen_depth == p_xpixmap_format->depth )
             {
-                p_vout->i_bytes_per_pixel = p_xpixmap_format->bits_per_pixel / 8;
+                if( p_xpixmap_format->bits_per_pixel / 8 > p_vout->i_bytes_per_pixel )
+                {
+                    p_vout->i_bytes_per_pixel = p_xpixmap_format->bits_per_pixel / 8;
+                }
             }
         }
         break;