diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-10-25 05:12:34 +0300 |
| commit | 030130942562bb7b84eeba53e0226abed5a63a4c (patch) | |
| tree | 9b49208facf2801369c9d2d7b3e7af11fab36829 /libvo/vo_x11.c | |
| parent | 562d86d95cbba67cb58358f6fc334553a467dee7 (diff) | |
| parent | 15a80092161a1cd305f8005c780c744416a5252b (diff) | |
| download | mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.bz2 mpv-030130942562bb7b84eeba53e0226abed5a63a4c.tar.xz | |
Merge svn changes up to 27824
Conflicts:
cfg-common-opts.h
libmpcodecs/dec_video.c
libmpcodecs/vd.c
libvo/x11_common.h
mplayer.c
stream/cache2.c
Diffstat (limited to 'libvo/vo_x11.c')
| -rw-r--r-- | libvo/vo_x11.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c index c3692cad58..18861e1266 100644 --- a/libvo/vo_x11.c +++ b/libvo/vo_x11.c @@ -480,7 +480,13 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, } while (fmte->mpfmt) { - if (IMGFMT_RGB_DEPTH(fmte->mpfmt) == myximage->bits_per_pixel && + int depth = IMGFMT_RGB_DEPTH(fmte->mpfmt); + /* bits_per_pixel in X seems to be set to 16 for 15 bit formats + => force depth to 16 so that only the color masks are used for the format check */ + if (depth == 15) + depth = 16; + + if (depth == myximage->bits_per_pixel && fmte->byte_order == myximage->byte_order && fmte->red_mask == myximage->red_mask && fmte->green_mask == myximage->green_mask && |