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 /libavcodec/xsubdec.c | |
| 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 'libavcodec/xsubdec.c')
| -rw-r--r-- | libavcodec/xsubdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c index 609f59b351..b229c696b9 100644 --- a/libavcodec/xsubdec.c +++ b/libavcodec/xsubdec.c @@ -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; } |