diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-12-03 13:33:48 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-12-03 13:33:48 +0000 |
| commit | cedb83a67146dfe9c89960103e07ad04efab7cb8 (patch) | |
| tree | 40e2d551a0f50f76462592296e690e5d38e0be1b /libavformat | |
| parent | 9aa8ed9d233481329475c9c7b67f84293d6a2d0b (diff) | |
| download | ffmpeg-cedb83a67146dfe9c89960103e07ad04efab7cb8.tar.gz | |
colour --> color in variable names
Originally committed as revision 11159 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/matroska.h | 2 | ||||
| -rw-r--r-- | libavformat/matroskadec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/matroska.h b/libavformat/matroska.h index fcfde37a03..b8d39bbcee 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -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 --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 19dcdfac49..51dbddc048 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1201,7 +1201,7 @@ matroska_add_stream (MatroskaDemuxContext *matroska) /* 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) |