Merge commit 'd5c62122a7b26704bf867a1262df358623bf5edf'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 12:35:42 +0000 (14:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 13 Oct 2012 12:35:42 +0000 (14:35 +0200)
commitd6c342fdc0b434b514f99e1feaa108ab17bba806
tree244b8c09cff87b34e1c94cfe3e8e2e15b415ce3c
parentd197bd4f5ee752c95ebaf7d94257ca5121309674
parentd5c62122a7b26704bf867a1262df358623bf5edf
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>
16 files changed:
libavcodec/asvdec.c
libavcodec/asvenc.c
libavcodec/bitstream.c
libavcodec/indeo2.c
libavcodec/ivi_common.c
libavcodec/mathops.h
libavcodec/mathtables.c
libavcodec/pcm.c
libavcodec/s302m.c
libavcodec/tiff.c
libavcodec/vble.c
libavcodec/wnv1.c
libavcodec/xbmenc.c
libavutil/common.h
libavutil/mathematics.c
libavutil/version.h