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>
This commit is contained in:
Michael Niedermayer
2012-10-21 13:29:03 +02:00
12 changed files with 126 additions and 55 deletions
+1
View File
@@ -33,6 +33,7 @@ OBJS = allcodecs.o \
resample.o \
resample2.o \
simple_idct.o \
sqrt_tab.o \
utils.o \
# parts needed for many different codecs