diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 16:35:42 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 16:35:42 +0400 |
commit | d6c342fdc0b434b514f99e1feaa108ab17bba806 (patch) | |
tree | 244b8c09cff87b34e1c94cfe3e8e2e15b415ce3c /libavcodec/indeo2.c | |
parent | d197bd4f5ee752c95ebaf7d94257ca5121309674 (diff) | |
parent | d5c62122a7b26704bf867a1262df358623bf5edf (diff) |
Merge commit 'd5c62122a7b26704bf867a1262df358623bf5edf'
* commit 'd5c62122a7b26704bf867a1262df358623bf5edf':
Move av_reverse table to libavcodec
Conflicts:
libavcodec/asvenc.c
libavcodec/vble.c
libavutil/common.h
libavutil/mathematics.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo2.c')
-rw-r--r-- | libavcodec/indeo2.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c index 4ca6703429..74a9800e2b 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -23,11 +23,13 @@ * @file * Intel Indeo 2 decoder. */ + #define BITSTREAM_READER_LE +#include "libavutil/attributes.h" #include "avcodec.h" #include "get_bits.h" #include "indeo2data.h" -#include "libavutil/common.h" +#include "mathops.h" typedef struct Ir2Context{ AVCodecContext *avctx; @@ -165,7 +167,7 @@ static int ir2_decode_frame(AVCodecContext *avctx, /* decide whether frame uses deltas or not */ #ifndef BITSTREAM_READER_LE for (i = 0; i < buf_size; i++) - buf[i] = av_reverse[buf[i]]; + buf[i] = ff_reverse[buf[i]]; #endif init_get_bits(&s->gb, buf + start, (buf_size - start) * 8); |