summaryrefslogtreecommitdiff
path: root/libavcodec/xan.c
diff options
context:
space:
mode:
authorMike Melanson <mike@multimedia.cx>2003-09-13 02:31:03 +0000
committerMike Melanson <mike@multimedia.cx>2003-09-13 02:31:03 +0000
commit0f371e3e2a406a327a4269a3bfe2b2a1d8a49681 (patch)
tree6639cb8740b735874159590b8883f9ff5100b0af /libavcodec/xan.c
parente7015b41e7b6d1fe00423229428ed25127f2bc73 (diff)
final word on RGBA byte order
Originally committed as revision 2268 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/xan.c')
-rw-r--r--libavcodec/xan.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/libavcodec/xan.c b/libavcodec/xan.c
index 918048f45f..e2e3e56e41 100644
--- a/libavcodec/xan.c
+++ b/libavcodec/xan.c
@@ -265,17 +265,6 @@ static void inline xan_wc3_build_palette(XanContext *s,
switch (s->avctx->pix_fmt) {
- case PIX_FMT_PAL8:
- for (i = 0; i < PALETTE_COUNT; i++) {
- r = *palette_data++;
- g = *palette_data++;
- b = *palette_data++;
- s->palette[i * 4 + 0] = b;
- s->palette[i * 4 + 1] = g;
- s->palette[i * 4 + 2] = r;
- }
- break;
-
case PIX_FMT_RGB555:
palette16 = (unsigned short *)s->palette;
for (i = 0; i < PALETTE_COUNT; i++) {
@@ -321,6 +310,7 @@ static void inline xan_wc3_build_palette(XanContext *s,
}
break;
+ case PIX_FMT_PAL8:
case PIX_FMT_RGBA32:
palette32 = (unsigned int *)s->palette;
for (i = 0; i < PALETTE_COUNT; i++) {