diff options
author | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-07 21:27:57 +0000 |
---|---|---|
committer | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-07 21:27:57 +0000 |
commit | e0ca9721bcf07175121316cc4c779d55c9a9d867 (patch) | |
tree | 19d12d5b208af359d7f430ff844fda54b87f468c /libvo/vo_x11.c | |
parent | 0b3bd9698d07ea2a105d432fef5dc649de4e1f0b (diff) | |
download | mpv-e0ca9721bcf07175121316cc4c779d55c9a9d867.tar.bz2 mpv-e0ca9721bcf07175121316cc4c779d55c9a9d867.tar.xz |
codecs.conf support
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@304 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_x11.c')
-rw-r--r-- | libvo/vo_x11.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index 1e6294a99f..49c5c61f44 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -514,11 +514,16 @@ 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; - } + } return 0; } |