merge from in qemu upstream: "Attempt to fix incorrect colours on some BGR displays...

diff --git a/sdl.c b/sdl.c
index 8fe968fa36d1b01c7a1b64b56fa6ba5b9ce40d94..2911c9be518bb44585f853748bf29765a47de945 100644 (file)
--- a/sdl.c
+++ b/sdl.c
@@ -245,7 +245,7 @@ static void sdl_resize(DisplayState *ds, int w, int h, int linesize)
     ds->height = h;
     if (!ds->shared_buf) {
         ds->depth = screen->format->BitsPerPixel;
-        if (ds->depth == 32 && screen->format->Rshift == 0) {
+       if (screen->format->Bshift > screen->format->Rshift) {
             ds->bgr = 1;
         } else {
             ds->bgr = 0;