diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 14:35:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-13 14:35:42 +0200 |
| commit | d6c342fdc0b434b514f99e1feaa108ab17bba806 (patch) | |
| tree | 244b8c09cff87b34e1c94cfe3e8e2e15b415ce3c /libavcodec/wnv1.c | |
| parent | d197bd4f5ee752c95ebaf7d94257ca5121309674 (diff) | |
| parent | d5c62122a7b26704bf867a1262df358623bf5edf (diff) | |
| download | android_external_ffmpeg-d6c342fdc0b434b514f99e1feaa108ab17bba806.tar.gz android_external_ffmpeg-d6c342fdc0b434b514f99e1feaa108ab17bba806.tar.bz2 android_external_ffmpeg-d6c342fdc0b434b514f99e1feaa108ab17bba806.zip | |
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/wnv1.c')
| -rw-r--r-- | libavcodec/wnv1.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index 643e871115..22a570cc9c 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -26,7 +26,7 @@ #include "avcodec.h" #include "get_bits.h" -#include "libavutil/common.h" +#include "mathops.h" typedef struct WNV1Context{ @@ -52,7 +52,7 @@ static inline int wnv1_get_code(WNV1Context *w, int base_value) int v = get_vlc2(&w->gb, code_vlc.table, CODE_VLC_BITS, 1); if(v==15) - return av_reverse[ get_bits(&w->gb, 8 - w->shift) ]; + return ff_reverse[ get_bits(&w->gb, 8 - w->shift) ]; else return base_value + ((v - 7)<<w->shift); } @@ -93,7 +93,7 @@ static int decode_frame(AVCodecContext *avctx, p->key_frame = 1; for(i=8; i<buf_size; i++) - rbuf[i]= av_reverse[ buf[i] ]; + rbuf[i]= ff_reverse[ buf[i] ]; init_get_bits(&l->gb, rbuf+8, (buf_size-8)*8); if (buf[2] >> 4 == 6) |