# HG changeset patch
# User diego
# Date 1196688828 0
# Node ID 888d5439eac68d1cb2031f00c05a95515f47d7d4
# Parent  c89e331851f3a0d8d0f9526c5df31c18c5ea3301
colour --> color in variable names

diff -r c89e331851f3 -r 888d5439eac6 matroska.h
--- a/matroska.h	Mon Dec 03 13:01:53 2007 +0000
+++ b/matroska.h	Mon Dec 03 13:33:48 2007 +0000
@@ -98,7 +98,7 @@
 #define MATROSKA_ID_VIDEOFLAGINTERLACED 0x9A
 #define MATROSKA_ID_VIDEOSTEREOMODE 0x53B9
 #define MATROSKA_ID_VIDEOASPECTRATIO 0x54B3
-#define MATROSKA_ID_VIDEOCOLOURSPACE 0x2EB524
+#define MATROSKA_ID_VIDEOCOLORSPACE 0x2EB524
 
 /* IDs in the trackaudio master */
 #define MATROSKA_ID_AUDIOSAMPLINGFREQ 0xB5
diff -r c89e331851f3 -r 888d5439eac6 matroskadec.c
--- a/matroskadec.c	Mon Dec 03 13:01:53 2007 +0000
+++ b/matroskadec.c	Mon Dec 03 13:33:48 2007 +0000
@@ -1201,7 +1201,7 @@
 
                         /* colorspace (only matters for raw video)
                          * fourcc */
-                        case MATROSKA_ID_VIDEOCOLOURSPACE: {
+                        case MATROSKA_ID_VIDEOCOLORSPACE: {
                             uint64_t num;
                             if ((res = ebml_read_uint(matroska, &id,
                                                       &num)) < 0)