diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-10-02 13:23:56 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-10-02 13:23:56 +0100 |
| commit | 53b98718f1bb8a69eba6c2ac5367f83c5174f9eb (patch) | |
| tree | c41bbfd7f7584c9c15b95f2fa23d65ee98ab1bb4 | |
| parent | fbcaca994df3d750ab98e61e36195aac07dab741 (diff) | |
| parent | 89ec031b09c81821e349c364575fad652395cf94 (diff) | |
| download | qemu-53b98718f1bb8a69eba6c2ac5367f83c5174f9eb.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20141002-1' into staging
pixman: fix qemu_default_pixman_format (32bpp non-native endian)
# gpg: Signature made Thu 02 Oct 2014 08:47:20 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-console-20141002-1:
pixman: fix qemu_default_pixman_format (32bpp non-native endian)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | ui/qemu-pixman.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c index 30c7fdd011..1f6fea535b 100644 --- a/ui/qemu-pixman.c +++ b/ui/qemu-pixman.c @@ -80,7 +80,7 @@ pixman_format_code_t qemu_default_pixman_format(int bpp, bool native_endian) case 24: return PIXMAN_b8g8r8; case 32: - return PIXMAN_b8g8r8a8; + return PIXMAN_b8g8r8x8; break; } } |