Mercurial > libavcodec.hg
comparison msvideo1.c @ 2967:ef2149182f1c libavcodec
COSMETICS: Remove all trailing whitespace.
| author | diego |
|---|---|
| date | Sat, 17 Dec 2005 18:14:38 +0000 |
| parents | f67b63ed036d |
| children | 0b546eab515d |
comparison
equal
deleted
inserted
replaced
| 2966:564788471dd4 | 2967:ef2149182f1c |
|---|---|
| 154 memcpy(colors, &s->buf[stream_ptr], 8); | 154 memcpy(colors, &s->buf[stream_ptr], 8); |
| 155 stream_ptr += 8; | 155 stream_ptr += 8; |
| 156 | 156 |
| 157 for (pixel_y = 0; pixel_y < 4; pixel_y++) { | 157 for (pixel_y = 0; pixel_y < 4; pixel_y++) { |
| 158 for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1) | 158 for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1) |
| 159 pixels[pixel_ptr++] = | 159 pixels[pixel_ptr++] = |
| 160 colors[((pixel_y & 0x2) << 1) + | 160 colors[((pixel_y & 0x2) << 1) + |
| 161 (pixel_x & 0x2) + ((flags & 0x1) ^ 1)]; | 161 (pixel_x & 0x2) + ((flags & 0x1) ^ 1)]; |
| 162 pixel_ptr -= row_dec; | 162 pixel_ptr -= row_dec; |
| 163 } | 163 } |
| 164 } else { | 164 } else { |
| 165 /* 1-color encoding */ | 165 /* 1-color encoding */ |
| 264 colors[7] = LE_16(&s->buf[stream_ptr]); | 264 colors[7] = LE_16(&s->buf[stream_ptr]); |
| 265 stream_ptr += 2; | 265 stream_ptr += 2; |
| 266 | 266 |
| 267 for (pixel_y = 0; pixel_y < 4; pixel_y++) { | 267 for (pixel_y = 0; pixel_y < 4; pixel_y++) { |
| 268 for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1) | 268 for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1) |
| 269 pixels[pixel_ptr++] = | 269 pixels[pixel_ptr++] = |
| 270 colors[((pixel_y & 0x2) << 1) + | 270 colors[((pixel_y & 0x2) << 1) + |
| 271 (pixel_x & 0x2) + ((flags & 0x1) ^ 1)]; | 271 (pixel_x & 0x2) + ((flags & 0x1) ^ 1)]; |
| 272 pixel_ptr -= row_dec; | 272 pixel_ptr -= row_dec; |
| 273 } | 273 } |
| 274 } else { | 274 } else { |
| 275 /* 2-color encoding */ | 275 /* 2-color encoding */ |