Mercurial > libavcodec.hg
comparison msvideo1.c @ 4364:05e932ddaaa9 libavcodec
rename BE/LE_8/16/32 to AV_RL/B_8/16/32
| author | alex |
|---|---|
| date | Fri, 19 Jan 2007 22:12:59 +0000 |
| parents | c8c591fe26f8 |
| children | 66ef3690d108 |
comparison
equal
deleted
inserted
replaced
| 4363:9b7662fa4905 | 4364:05e932ddaaa9 |
|---|---|
| 243 } else if (byte_b < 0x80) { | 243 } else if (byte_b < 0x80) { |
| 244 /* 2- or 8-color encoding modes */ | 244 /* 2- or 8-color encoding modes */ |
| 245 flags = (byte_b << 8) | byte_a; | 245 flags = (byte_b << 8) | byte_a; |
| 246 | 246 |
| 247 CHECK_STREAM_PTR(4); | 247 CHECK_STREAM_PTR(4); |
| 248 colors[0] = LE_16(&s->buf[stream_ptr]); | 248 colors[0] = AV_RL16(&s->buf[stream_ptr]); |
| 249 stream_ptr += 2; | 249 stream_ptr += 2; |
| 250 colors[1] = LE_16(&s->buf[stream_ptr]); | 250 colors[1] = AV_RL16(&s->buf[stream_ptr]); |
| 251 stream_ptr += 2; | 251 stream_ptr += 2; |
| 252 | 252 |
| 253 if (colors[0] & 0x8000) { | 253 if (colors[0] & 0x8000) { |
| 254 /* 8-color encoding */ | 254 /* 8-color encoding */ |
| 255 CHECK_STREAM_PTR(12); | 255 CHECK_STREAM_PTR(12); |
| 256 colors[2] = LE_16(&s->buf[stream_ptr]); | 256 colors[2] = AV_RL16(&s->buf[stream_ptr]); |
| 257 stream_ptr += 2; | 257 stream_ptr += 2; |
| 258 colors[3] = LE_16(&s->buf[stream_ptr]); | 258 colors[3] = AV_RL16(&s->buf[stream_ptr]); |
| 259 stream_ptr += 2; | 259 stream_ptr += 2; |
| 260 colors[4] = LE_16(&s->buf[stream_ptr]); | 260 colors[4] = AV_RL16(&s->buf[stream_ptr]); |
| 261 stream_ptr += 2; | 261 stream_ptr += 2; |
| 262 colors[5] = LE_16(&s->buf[stream_ptr]); | 262 colors[5] = AV_RL16(&s->buf[stream_ptr]); |
| 263 stream_ptr += 2; | 263 stream_ptr += 2; |
| 264 colors[6] = LE_16(&s->buf[stream_ptr]); | 264 colors[6] = AV_RL16(&s->buf[stream_ptr]); |
| 265 stream_ptr += 2; | 265 stream_ptr += 2; |
| 266 colors[7] = LE_16(&s->buf[stream_ptr]); | 266 colors[7] = AV_RL16(&s->buf[stream_ptr]); |
| 267 stream_ptr += 2; | 267 stream_ptr += 2; |
| 268 | 268 |
| 269 for (pixel_y = 0; pixel_y < 4; pixel_y++) { | 269 for (pixel_y = 0; pixel_y < 4; pixel_y++) { |
| 270 for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1) | 270 for (pixel_x = 0; pixel_x < 4; pixel_x++, flags >>= 1) |
| 271 pixels[pixel_ptr++] = | 271 pixels[pixel_ptr++] = |