Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 12:26:46 +0000 (14:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 12 Oct 2012 12:26:46 +0000 (14:26 +0200)
commite335658370840390272b70de92f5a76860537fb9
tree8f9074bfd2d0f5c6c09c34f23b354ee9dbce7e56
parent43cce41267a7aa71946911e87b4dfce48183bb25
parent9734b8ba56d05e970c353dfd5baafa43fdb08024
Merge commit '9734b8ba56d05e970c353dfd5baafa43fdb08024'

* commit '9734b8ba56d05e970c353dfd5baafa43fdb08024':
  Move avutil tables only used in libavcodec to libavcodec.

Conflicts:
libavcodec/mathtables.c
libavutil/intmath.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
libavcodec/Makefile
libavcodec/arm/mathops.h
libavcodec/mathops.h
libavcodec/mathtables.c
libavcodec/motion_est.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c
libavcodec/ra144.c
libavcodec/roqaudioenc.c
libavutil/Makefile
libavutil/arm/intmath.h
libavutil/intmath.h
libavutil/mathematics.c