# HG changeset patch # User romansh # Date 1067974543 0 # Node ID 6ee1b02f9b2a7b39a0403702f525ca366a9569f1 # Parent 5ee1aa8cc0ea027d94a89b2d4efa1945e45c5e17 * fixes for broken builds on Solaris, OS2 and all bingendian systems out there. diff -r 5ee1aa8cc0ea -r 6ee1b02f9b2a asf.c --- a/asf.c Tue Nov 04 12:55:26 2003 +0000 +++ b/asf.c Tue Nov 04 19:35:43 2003 +0000 @@ -915,8 +915,8 @@ if (st->codec.extradata_size && (st->codec.bits_per_sample <= 8)) { st->codec.palctrl = av_mallocz(sizeof(AVPaletteControl)); #ifdef WORDS_BIGENDIAN - for (i = 0; i < FFMIN(st->codec.extradata_size / 4, 256); i++) - st->codec.palctrl->palette[i] = bswap_32(st->codec.extradata)[i * 4]); + for (i = 0; i < FFMIN(st->codec.extradata_size, AVPALETTE_SIZE)/4; i++) + st->codec.palctrl->palette[i] = bswap_32(((uint32_t*)st->codec.extradata)[i]); #else memcpy(st->codec.palctrl->palette, st->codec.extradata, FFMIN(st->codec.extradata_size, AVPALETTE_SIZE)); diff -r 5ee1aa8cc0ea -r 6ee1b02f9b2a avidec.c --- a/avidec.c Tue Nov 04 12:55:26 2003 +0000 +++ b/avidec.c Tue Nov 04 19:35:43 2003 +0000 @@ -249,8 +249,8 @@ if (st->codec.extradata_size && (st->codec.bits_per_sample <= 8)) { st->codec.palctrl = av_mallocz(sizeof(AVPaletteControl)); #ifdef WORDS_BIGENDIAN - for (i = 0; i < FFMIN(st->codec.extradata_size / 4, 256); i++) - st->codec.palctrl->palette[i] = bswap_32(st->codec.extradata)[i * 4]); + for (i = 0; i < FFMIN(st->codec.extradata_size, AVPALETTE_SIZE)/4; i++) + st->codec.palctrl->palette[i] = bswap_32(((uint32_t*)st->codec.extradata)[i]); #else memcpy(st->codec.palctrl->palette, st->codec.extradata, FFMIN(st->codec.extradata_size, AVPALETTE_SIZE));