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/vble.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/vble.c')
| -rw-r--r-- | libavcodec/vble.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/vble.c b/libavcodec/vble.c index 0c8f36c28e..07efad8f4a 100644 --- a/libavcodec/vble.c +++ b/libavcodec/vble.c @@ -29,6 +29,7 @@ #include "avcodec.h" #include "dsputil.h" #include "get_bits.h" +#include "mathops.h" typedef struct { AVCodecContext *avctx; |