Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMats Peterson <matsp888@yahoo.com>2015-12-29 09:35:00 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2015-12-29 15:12:18 +0300
commitbd03ee1184e404e8fc69f8ab4787b2ee02554d5b (patch)
tree617486e373f40507dd74a38bef08aa3af62e947b /libavformat/qtpalette.h
parentc51c08e0e70c186971385bdbb225f69edd4e3375 (diff)
lavf/qtpalette: Treat 1-bit video as palettized
This commit for qtpalette.c and qtpalette.h adds 1-bit video to the "palettized video" category, since if the video sample description contains a palette, the two colors in the palette can be any color, not necessarily black & white. Unfortunately, I've noticed that the qtrle (QuickTime Animation) decoder blindly assumes that 1-bit video is black & white. I don't have enough knowledge about the decoder to fix this, though. Below is a link to a sample 1-bit QuickTime Animation clip of a rotating earth that uses blueish colors, and they will be correctly rendered in QuickTime, but not in FFmpeg (which will use black & white). https://drive.google.com/open?id=0B3_pEBoLs0faUlItWm9KaGJSTEE Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/qtpalette.h')
-rw-r--r--libavformat/qtpalette.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/libavformat/qtpalette.h b/libavformat/qtpalette.h
index da83421d84..b2bd3600c5 100644
--- a/libavformat/qtpalette.h
+++ b/libavformat/qtpalette.h
@@ -26,6 +26,11 @@
#include <stdint.h>
#include "avformat.h"
+static const uint8_t ff_qt_default_palette_2[2 * 3] = {
+ 0xFF, 0xFF, 0xFF,
+ 0x00, 0x00, 0x00
+};
+
static const uint8_t ff_qt_default_palette_4[4 * 3] = {
0x93, 0x65, 0x5E,
0xFF, 0xFF, 0xFF,