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/xbmenc.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/xbmenc.c')
| -rw-r--r-- | libavcodec/xbmenc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/xbmenc.c b/libavcodec/xbmenc.c index ee1391b2b2..ddfc15b738 100644 --- a/libavcodec/xbmenc.c +++ b/libavcodec/xbmenc.c @@ -22,7 +22,7 @@ #include "avcodec.h" #include "internal.h" -#include "libavutil/common.h" +#include "mathops.h" static av_cold int xbm_encode_init(AVCodecContext *avctx) { @@ -53,7 +53,7 @@ static int xbm_encode_frame(AVCodecContext *avctx, AVPacket *pkt, buf += snprintf(buf, 40, "static unsigned char image_bits[] = {\n"); for (i = 0; i < avctx->height; i++) { for (j = 0; j < linesize; j++) - buf += snprintf(buf, 7, " 0x%02X,", av_reverse[*ptr++]); + buf += snprintf(buf, 7, " 0x%02X,", ff_reverse[*ptr++]); ptr += p->linesize[0] - linesize; buf += snprintf(buf, 2, "\n"); } |