summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormplayer-svn <svn@mplayerhq.hu>2012-02-07 21:56:45 +0000
committerwm4 <wm4@nowhere>2012-08-03 01:44:11 +0200
commit47a0e4fadd2b47d783aaeed4561b0627d0df8251 (patch)
tree09b35082671c3aa9069067e36f13752b04eadf74
parentf200c8590687eb55e1008dff1fb5e10d2ff23783 (diff)
downloadmpv-47a0e4fadd2b47d783aaeed4561b0627d0df8251.tar.bz2
mpv-47a0e4fadd2b47d783aaeed4561b0627d0df8251.tar.xz
vo_x11: X11 non-native RGB/BGR "emulation" only works for 32bit
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@34658 b3059339-0415-0410-9bf9-f77b7e298cf2 Author: cehoyos
-rw-r--r--libvo/vo_x11.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libvo/vo_x11.c b/libvo/vo_x11.c
index 29975b3a4a..b873113cb8 100644
--- a/libvo/vo_x11.c
+++ b/libvo/vo_x11.c
@@ -428,9 +428,8 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width,
draw_alpha_fnc = draw_alpha_null;
}
out_offset = 0;
- // for these formats conversion is currently not support and
- // we can easily "emulate" them.
- if (out_format & 64 && (IMGFMT_IS_RGB(out_format) || IMGFMT_IS_BGR(out_format))) {
+ // We can easily "emulate" non-native RGB32 and BGR32
+ if (out_format == (IMGFMT_BGR32 | 64) || out_format == (IMGFMT_RGB32 | 64)) {
out_format &= ~64;
#if BYTE_ORDER == BIG_ENDIAN
out_offset = 1;