diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2007-08-13 13:20:16 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2007-08-13 13:20:16 +0000 |
| commit | 07c02992b9ea9f6ea4a47d2fd800ee7524151d36 (patch) | |
| tree | 67a0c440a26cf43451915b7a282344b449644c59 | |
| parent | 8838141268e48a6a0519332b4c21d06c6b52bb7d (diff) | |
| download | ffmpeg-07c02992b9ea9f6ea4a47d2fd800ee7524151d36.tar.gz | |
use bytestream_get_le*() this also fixes a big endian bug
Originally committed as revision 10104 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/4xm.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index ba80a1531a..7af22c7963 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -27,6 +27,7 @@ #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" +#include "bytestream.h" //#undef NDEBUG //#include <assert.h> @@ -597,8 +598,8 @@ static int decode_i2_frame(FourXContext *f, uint8_t *buf, int length){ unsigned int color[4], bits; memset(color, 0, sizeof(color)); //warning following is purely guessed ... - color[0]= AV_RN16(buf); buf+=2; //FIXME use bytestream - color[1]= AV_RN16(buf); buf+=2; + color[0]= bytestream_get_le16(&buf); + color[1]= bytestream_get_le16(&buf); if(color[0]&0x8000) av_log(NULL, AV_LOG_ERROR, "unk bit 1\n"); if(color[1]&0x8000) av_log(NULL, AV_LOG_ERROR, "unk bit 2\n"); @@ -606,7 +607,7 @@ static int decode_i2_frame(FourXContext *f, uint8_t *buf, int length){ color[2]= mix(color[0], color[1]); color[3]= mix(color[1], color[0]); - bits= AV_RL32(buf); buf+= 4; + bits= bytestream_get_le32(&buf); for(y2=0; y2<16; y2++){ for(x2=0; x2<16; x2++){ int index= 2*(x2>>2) + 8*(y2>>2); |