Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Oct 2012 11:29:03 +0000 (13:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 21 Oct 2012 11:35:42 +0000 (13:35 +0200)
commitdcbff35199e1596d9d1200e734ef4a4c306e50f1
treee173e3208ed6a79a0648e4324c3cc398b7d176ca
parent05f228b0a01e8b97ba73a15c1eccb6b0a9060633
parentd15c21e5fa3961f10026da1a3080a3aa3cf4cec9
Merge commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9'

* commit 'd15c21e5fa3961f10026da1a3080a3aa3cf4cec9':
  avutil: Add a copy of ff_sqrt_tab back into avutil to restore ABI compatibility
  avutil: make some tables visible again
  avutil: remove inline av_log2 from public API
  celp_math: rename ff_log2 to ff_log2_q15

Conflicts:
libavutil/libavutil.v

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/Makefile
libavcodec/acelp_pitch_delay.c
libavcodec/celp_math.c
libavcodec/celp_math.h
libavcodec/mathtables.c
libavcodec/sqrt_tab.c
libavutil/Makefile
libavutil/common.h
libavutil/intmath.h
libavutil/libavutil.v
libavutil/log2.c