diff options
| author | Mike Melanson <mike@multimedia.cx> | 2005-05-28 01:40:40 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2005-05-28 01:40:40 +0000 |
| commit | 875da7c6e187d3aacaac0107deb45200286dfa7d (patch) | |
| tree | e2d712d2421af99313febe40d6e269a6e2c76dc7 /src/libffmpeg/libavcodec/indeo2.c | |
| parent | 59167cc289f66b54b862c2001c1a6a6c4e8f86d0 (diff) | |
| download | xine-lib-875da7c6e187d3aacaac0107deb45200286dfa7d.tar.gz xine-lib-875da7c6e187d3aacaac0107deb45200286dfa7d.tar.bz2 | |
sync to libavcodec build 4755
CVS patchset: 7567
CVS date: 2005/05/28 01:40:40
Diffstat (limited to 'src/libffmpeg/libavcodec/indeo2.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/indeo2.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/libffmpeg/libavcodec/indeo2.c b/src/libffmpeg/libavcodec/indeo2.c index 1cee019dd..25561ec2d 100644 --- a/src/libffmpeg/libavcodec/indeo2.c +++ b/src/libffmpeg/libavcodec/indeo2.c @@ -22,7 +22,7 @@ * @file indeo2.c * Intel Indeo 2 decoder. */ - +#define ALT_BITSTREAM_READER_LE #include "avcodec.h" #include "bitstream.h" #include "indeo2data.h" @@ -156,10 +156,10 @@ static int ir2_decode_frame(AVCodecContext *avctx, s->decode_delta = buf[18]; /* decide whether frame uses deltas or not */ - +#ifndef ALT_BITSTREAM_READER_LE for (i = 0; i < buf_size; i++) buf[i] = ff_reverse[buf[i]]; - +#endif start = 48; /* hardcoded for now */ init_get_bits(&s->gb, buf + start, buf_size - start); @@ -198,8 +198,12 @@ static int ir2_decode_init(AVCodecContext *avctx){ if (!ir2_vlc.table) init_vlc(&ir2_vlc, CODE_VLC_BITS, IR2_CODES, &ir2_codes[0][1], 4, 2, - &ir2_codes[0][0], 4, 2, 1); - +#ifdef ALT_BITSTREAM_READER_LE + &ir2_codes[0][0], 4, 2, INIT_VLC_USE_STATIC | INIT_VLC_LE); +#else + &ir2_codes[0][0], 4, 2, INIT_VLC_USE_STATIC); +#endif + return 0; } |