comparison xsubdec.c @ 5982:1900b70712ab libavcodec

colour --> color in variable names
author diego
date Mon, 03 Dec 2007 13:33:48 +0000
parents 80b481ec72a6
children dfdff1ca78a7
comparison
equal deleted inserted replaced
5981:b60d7f351e9d 5982:1900b70712ab
106 // interlaced: do odd lines 106 // interlaced: do odd lines
107 if (y == (h + 1) / 2) bitmap = sub->rects[0].bitmap + w; 107 if (y == (h + 1) / 2) bitmap = sub->rects[0].bitmap + w;
108 for (x = 0; x < w; ) { 108 for (x = 0; x < w; ) {
109 int log2 = ff_log2_tab[show_bits(&gb, 8)]; 109 int log2 = ff_log2_tab[show_bits(&gb, 8)];
110 int run = get_bits(&gb, 14 - 4 * (log2 >> 1)); 110 int run = get_bits(&gb, 14 - 4 * (log2 >> 1));
111 int colour = get_bits(&gb, 2); 111 int color = get_bits(&gb, 2);
112 run = FFMIN(run, w - x); 112 run = FFMIN(run, w - x);
113 // run length 0 means till end of row 113 // run length 0 means till end of row
114 if (!run) run = w - x; 114 if (!run) run = w - x;
115 memset(bitmap, colour, run); 115 memset(bitmap, color, run);
116 bitmap += run; 116 bitmap += run;
117 x += run; 117 x += run;
118 } 118 }
119 // interlaced, skip every second line 119 // interlaced, skip every second line
120 bitmap += w; 120 bitmap += w;