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/asvenc.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/asvenc.c')
| -rw-r--r-- | libavcodec/asvenc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/asvenc.c b/libavcodec/asvenc.c index 0f48e4445a..259cd689a5 100644 --- a/libavcodec/asvenc.c +++ b/libavcodec/asvenc.c @@ -23,16 +23,17 @@ * ASUS V1/V2 encoder. */ -#include "libavutil/common.h" +#include "libavutil/attributes.h" #include "libavutil/mem.h" #include "asv.h" #include "avcodec.h" #include "internal.h" +#include "mathops.h" #include "mpeg12data.h" static inline void asv2_put_bits(PutBitContext *pb, int n, int v){ - put_bits(pb, n, av_reverse[ v << (8-n) ]); + put_bits(pb, n, ff_reverse[ v << (8-n) ]); } static inline void asv1_put_level(PutBitContext *pb, int level){ @@ -224,7 +225,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, else{ int i; for(i=0; i<4*size; i++) - pkt->data[i] = av_reverse[pkt->data[i]]; + pkt->data[i] = ff_reverse[pkt->data[i]]; } pkt->size = size*4; |