From d6b3062b5a6ae8bd845ed673c38546ec593f719a Mon Sep 17 00:00:00 2001 From: Mats Peterson Date: Tue, 19 Jan 2016 03:38:15 +0100 Subject: [PATCH] lavf/qtpalette: Fix incorrect palettes This patch corrects the colors of the 2 and 4 bpp palettes. Signed-off-by: Michael Niedermayer --- libavformat/qtpalette.h | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/libavformat/qtpalette.h b/libavformat/qtpalette.h index b2bd3600c5..016e91f1b3 100644 --- a/libavformat/qtpalette.h +++ b/libavformat/qtpalette.h @@ -31,29 +31,31 @@ static const uint8_t ff_qt_default_palette_2[2 * 3] = { 0x00, 0x00, 0x00 }; +/* From a screenshot of the "Monitors & Sound" control panel in Mac OS 7.5.5 */ static const uint8_t ff_qt_default_palette_4[4 * 3] = { - 0x93, 0x65, 0x5E, 0xFF, 0xFF, 0xFF, - 0xDF, 0xD0, 0xAB, + 0xAC, 0xAC, 0xAC, + 0x55, 0x55, 0x55, 0x00, 0x00, 0x00 }; +/* From a screenshot of the "Monitors & Sound" control panel in Mac OS 7.5.5 */ static const uint8_t ff_qt_default_palette_16[16 * 3] = { - 0xFF, 0xFB, 0xFF, - 0xEF, 0xD9, 0xBB, - 0xE8, 0xC9, 0xB1, - 0x93, 0x65, 0x5E, - 0xFC, 0xDE, 0xE8, - 0x9D, 0x88, 0x91, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, - 0x47, 0x48, 0x37, - 0x7A, 0x5E, 0x55, - 0xDF, 0xD0, 0xAB, - 0xFF, 0xFB, 0xF9, - 0xE8, 0xCA, 0xC5, - 0x8A, 0x7C, 0x77, + 0xFC, 0xF3, 0x05, + 0xFF, 0x64, 0x02, + 0xDD, 0x08, 0x06, + 0xF2, 0x08, 0x84, + 0x46, 0x00, 0xA5, + 0x00, 0x00, 0xD4, + 0x02, 0xAB, 0xEA, + 0x1F, 0xB7, 0x14, + 0x00, 0x64, 0x11, + 0x56, 0x2C, 0x05, + 0x90, 0x71, 0x3A, + 0xC0, 0xC0, 0xC0, + 0x80, 0x80, 0x80, + 0x40, 0x40, 0x40, 0x00, 0x00, 0x00 };