summaryrefslogtreecommitdiff
path: root/libavcodec/asvdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-13 14:35:42 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-13 14:35:42 +0200
commitd6c342fdc0b434b514f99e1feaa108ab17bba806 (patch)
tree244b8c09cff87b34e1c94cfe3e8e2e15b415ce3c /libavcodec/asvdec.c
parentd197bd4f5ee752c95ebaf7d94257ca5121309674 (diff)
parentd5c62122a7b26704bf867a1262df358623bf5edf (diff)
downloadffmpeg-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/asvdec.c')
-rw-r--r--libavcodec/asvdec.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/asvdec.c b/libavcodec/asvdec.c
index 35d3b50331..b9686a2aeb 100644
--- a/libavcodec/asvdec.c
+++ b/libavcodec/asvdec.c
@@ -23,13 +23,14 @@
* ASUS V1/V2 decoder.
*/
-#include "libavutil/common.h"
+#include "libavutil/attributes.h"
#include "libavutil/mem.h"
#include "asv.h"
#include "avcodec.h"
#include "put_bits.h"
#include "dsputil.h"
+#include "mathops.h"
#include "mpeg12data.h"
#define VLC_BITS 6
@@ -67,7 +68,7 @@ static av_cold void init_vlcs(ASV1Context *a){
//FIXME write a reversed bitstream reader to avoid the double reverse
static inline int asv2_get_bits(GetBitContext *gb, int n){
- return av_reverse[ get_bits(gb, n) << (8-n) ];
+ return ff_reverse[ get_bits(gb, n) << (8-n) ];
}
static inline int asv1_get_level(GetBitContext *gb){
@@ -207,7 +208,7 @@ static int decode_frame(AVCodecContext *avctx,
else{
int i;
for(i=0; i<buf_size; i++)
- a->bitstream_buffer[i]= av_reverse[ buf[i] ];
+ a->bitstream_buffer[i]= ff_reverse[ buf[i] ];
}
init_get_bits(&a->gb, a->bitstream_buffer, buf_size*8);