Mercurial > mplayer.hg

changeset 325:b2fd5c172f80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
vo_x11 query_format fix
author laaz
date Tue, 10 Apr 2001 00:18:41 +0000
parents 720c640332c8
children f6b5c2dbc88e
files libvo/vo_x11.c
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_x11.c	Tue Apr 10 00:00:04 2001 +0000
+++ b/libvo/vo_x11.c	Tue Apr 10 00:18:41 2001 +0000
@@ -515,7 +515,14 @@
 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;