Commit cedb83a6 authored by Diego Biurrun's avatar Diego Biurrun
Browse files

colour --> color in variable names

Originally committed as revision 11159 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9aa8ed9d
......@@ -172,8 +172,8 @@ typedef struct DVBSubObjectDisplay {
int x_pos;
int y_pos;
int fgcolour;
int bgcolour;
int fgcolor;
int bgcolor;
struct DVBSubObjectDisplay *region_list_next;
struct DVBSubObjectDisplay *object_list_next;
......@@ -206,7 +206,7 @@ typedef struct DVBSubRegion {
int depth;
int clut;
int bgcolour;
int bgcolor;
uint8_t *pbuf;
int buf_size;
......@@ -844,7 +844,7 @@ static void dvbsub_parse_object_segment(AVCodecContext *avctx,
DVBSubObjectDisplay *display;
int top_field_len, bottom_field_len;
int coding_method, non_modifying_colour;
int coding_method, non_modifying_color;
object_id = AV_RB16(buf);
buf += 2;
......@@ -855,7 +855,7 @@ static void dvbsub_parse_object_segment(AVCodecContext *avctx,
return;
coding_method = ((*buf) >> 2) & 3;
non_modifying_colour = ((*buf++) >> 1) & 1;
non_modifying_color = ((*buf++) >> 1) & 1;
if (coding_method == 0) {
top_field_len = AV_RB16(buf);
......@@ -872,7 +872,7 @@ static void dvbsub_parse_object_segment(AVCodecContext *avctx,
block = buf;
dvbsub_parse_pixel_data_block(avctx, display, block, top_field_len, 0,
non_modifying_colour);
non_modifying_color);
if (bottom_field_len > 0)
block = buf + top_field_len;
......@@ -880,7 +880,7 @@ static void dvbsub_parse_object_segment(AVCodecContext *avctx,
bottom_field_len = top_field_len;
dvbsub_parse_pixel_data_block(avctx, display, block, bottom_field_len, 1,
non_modifying_colour);
non_modifying_color);
}
/* } else if (coding_method == 1) {*/
......@@ -1035,14 +1035,14 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx,
region->clut = *buf++;
if (region->depth == 8)
region->bgcolour = *buf++;
region->bgcolor = *buf++;
else {
buf += 1;
if (region->depth == 4)
region->bgcolour = (((*buf++) >> 4) & 15);
region->bgcolor = (((*buf++) >> 4) & 15);
else
region->bgcolour = (((*buf++) >> 2) & 3);
region->bgcolor = (((*buf++) >> 2) & 3);
}
#ifdef DEBUG
......@@ -1050,9 +1050,9 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx,
#endif
if (fill) {
memset(region->pbuf, region->bgcolour, region->buf_size);
memset(region->pbuf, region->bgcolor, region->buf_size);
#ifdef DEBUG
av_log(avctx, AV_LOG_INFO, "Fill region (%d)\n", region->bgcolour);
av_log(avctx, AV_LOG_INFO, "Fill region (%d)\n", region->bgcolor);
#endif
}
......@@ -1085,8 +1085,8 @@ static void dvbsub_parse_region_segment(AVCodecContext *avctx,
buf += 2;
if ((object->type == 1 || object->type == 2) && buf+1 < buf_end) {
display->fgcolour = *buf++;
display->bgcolour = *buf++;
display->fgcolor = *buf++;
display->bgcolor = *buf++;
}
display->region_list_next = region->display_list;
......
......@@ -108,11 +108,11 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
for (x = 0; x < w; ) {
int log2 = ff_log2_tab[show_bits(&gb, 8)];
int run = get_bits(&gb, 14 - 4 * (log2 >> 1));
int colour = get_bits(&gb, 2);
int color = get_bits(&gb, 2);
run = FFMIN(run, w - x);
// run length 0 means till end of row
if (!run) run = w - x;
memset(bitmap, colour, run);
memset(bitmap, color, run);
bitmap += run;
x += run;
}
......
......@@ -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
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment