Mercurial > libavformat.hg

changeset 2805:888d5439eac6 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
colour --> color in variable names
author diego
date Mon, 03 Dec 2007 13:33:48 +0000
parents c89e331851f3
children 1ce39cda4a59
files matroska.h matroskadec.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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)