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/tiff.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/tiff.c')
| -rw-r--r-- | libavcodec/tiff.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/tiff.c b/libavcodec/tiff.c index bb11a23d19..ed4670f23e 100644 --- a/libavcodec/tiff.c +++ b/libavcodec/tiff.c @@ -34,7 +34,8 @@ #include "tiff.h" #include "tiff_data.h" #include "faxcompr.h" -#include "libavutil/common.h" +#include "mathops.h" +#include "libavutil/attributes.h" #include "libavutil/intreadwrite.h" #include "libavutil/imgutils.h" #include "libavutil/avstring.h" @@ -458,7 +459,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride, memcpy(src2, src, size); } else { for (i = 0; i < size; i++) - src2[i] = av_reverse[src[i]]; + src2[i] = ff_reverse[src[i]]; } memset(src2 + size, 0, FF_INPUT_BUFFER_PADDING_SIZE); switch (s->compr) { @@ -492,7 +493,7 @@ static int tiff_unpack_strip(TiffContext *s, uint8_t *dst, int stride, } else { int i; for (i = 0; i < width; i++) - dst[i] = av_reverse[src[i]]; + dst[i] = ff_reverse[src[i]]; } src += width; break; |