From 32205998de2fe0e230693d3053ef5053646de244 Mon Sep 17 00:00:00 2001
From: laaz <laaz@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 10 Apr 2001 00:18:41 +0000
Subject: vo_x11 query_format fix

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@326 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libvo/vo_x11.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'libvo')

diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index e636e01fd4..ae39783e43 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -515,7 +515,14 @@ static uint32_t draw_frame( uint8_t *src[] )
 static uint32_t query_format( uint32_t format )
 {
  if( !vo_init() ) return 0; // Can't open X11
- if( ( format&IMGFMT_BGR_MASK )==IMGFMT_BGR && ( format&0xFF )==vo_depthonscreen ) return 1;
+
+ if( ( format&IMGFMT_BGR_MASK )==IMGFMT_BGR ){
+   int bpp=format&0xFF;
+   if( bpp==vo_depthonscreen ) return 1;
+   if( bpp==15 && vo_depthonscreen==16) return 1; // built-in conversion
+   if( bpp==24 && vo_depthonscreen==32) return 1; // built-in conversion
+ }
+
  switch( format )
   {
    case IMGFMT_YV12: return 1;
-- 
cgit v1.2.3