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/bitstream.c | |
| parent | d197bd4f5ee752c95ebaf7d94257ca5121309674 (diff) | |
| parent | d5c62122a7b26704bf867a1262df358623bf5edf (diff) | |
| download | ffmpeg-d6c342fdc0b434b514f99e1feaa108ab17bba806.tar.gz | |
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/bitstream.c')
| -rw-r--r-- | libavcodec/bitstream.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index ce20f5685e..ce83ee01f9 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -30,6 +30,7 @@ #include "libavutil/avassert.h" #include "avcodec.h" +#include "mathops.h" #include "get_bits.h" #include "put_bits.h" @@ -115,10 +116,10 @@ static int alloc_table(VLC *vlc, int size, int use_static) } static av_always_inline uint32_t bitswap_32(uint32_t x) { - return (uint32_t)av_reverse[x&0xFF]<<24 - | (uint32_t)av_reverse[(x>>8)&0xFF]<<16 - | (uint32_t)av_reverse[(x>>16)&0xFF]<<8 - | (uint32_t)av_reverse[x>>24]; + return (uint32_t)ff_reverse[x&0xFF]<<24 + | (uint32_t)ff_reverse[(x>>8)&0xFF]<<16 + | (uint32_t)ff_reverse[(x>>16)&0xFF]<<8 + | (uint32_t)ff_reverse[x>>24]; } typedef struct { |