aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ross <pross@xvid.org>2010-06-08 11:42:21 +0000
committerPeter Ross <pross@xvid.org>2010-06-08 11:42:21 +0000
commitb995a6a84f84db79c8d40800d96911a355eb2646 (patch)
tree078623678043ac8d85165314ecfbf4f255c0255d
parent701ea516eeafc38b5077eca2ce5e994f306e5165 (diff)
downloadffmpeg-b995a6a84f84db79c8d40800d96911a355eb2646.tar.gz
Add ff_ega_palette
Originally committed as revision 23530 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/cga_data.c11
-rw-r--r--libavcodec/cga_data.h1
2 files changed, 12 insertions, 0 deletions
diff --git a/libavcodec/cga_data.c b/libavcodec/cga_data.c
index 2d1f89ce3f..35239814ec 100644
--- a/libavcodec/cga_data.c
+++ b/libavcodec/cga_data.c
@@ -155,3 +155,14 @@ const uint32_t ff_cga_palette[16] = {
0x000000, 0x0000AA, 0x00AA00, 0x00AAAA, 0xAA0000, 0xAA00AA, 0xAA5500, 0xAAAAAA,
0x555555, 0x5555FF, 0x55FF55, 0x55FFFF, 0xFF5555, 0xFF55FF, 0xFFFF55, 0xFFFFFF,
};
+
+const uint32_t ff_ega_palette[64] = {
+ 0x000000, 0x0000AA, 0x00AA00, 0x00AAAA, 0xAA0000, 0xAA00AA, 0xAAAA00, 0xAAAAAA,
+ 0x000055, 0x0000FF, 0x00AA55, 0x00AAFF, 0xAA0055, 0xAA00FF, 0xAAAA55, 0xAAAAFF,
+ 0x005500, 0x0055AA, 0x00FF00, 0x00FFAA, 0xAA5500, 0xAA55AA, 0xAAFF00, 0xAAFFAA,
+ 0x005555, 0x0055FF, 0x00FF55, 0x00FFFF, 0xAA5555, 0xAA55FF, 0xAAFF55, 0xAAFFFF,
+ 0x550000, 0x5500AA, 0x55AA00, 0x55AAAA, 0xFF0000, 0xFF00AA, 0xFFAA00, 0xFFAAAA,
+ 0x550055, 0x5500FF, 0x55AA55, 0x55AAFF, 0xFF0055, 0xFF00FF, 0xFFAA55, 0xFFAAFF,
+ 0x555500, 0x5555AA, 0x55FF00, 0x55FFAA, 0xFF5500, 0xFF55AA, 0xFFFF00, 0xFFFFAA,
+ 0x555555, 0x5555FF, 0x55FF55, 0x55FFFF, 0xFF5555, 0xFF55FF, 0xFFFF55, 0xFFFFFF
+};
diff --git a/libavcodec/cga_data.h b/libavcodec/cga_data.h
index c3f69f1f62..09aaaa57a1 100644
--- a/libavcodec/cga_data.h
+++ b/libavcodec/cga_data.h
@@ -25,5 +25,6 @@
extern const uint8_t ff_cga_font[2048];
extern const uint32_t ff_cga_palette[16];
+extern const uint32_t ff_ega_palette[64];
#endif