diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 13:29:03 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 13:35:42 +0200 |
commit | dcbff35199e1596d9d1200e734ef4a4c306e50f1 (patch) | |
tree | e173e3208ed6a79a0648e4324c3cc398b7d176ca /libavcodec/Makefile | |
parent | 05f228b0a01e8b97ba73a15c1eccb6b0a9060633 (diff) | |
parent | d15c21e5fa3961f10026da1a3080a3aa3cf4cec9 (diff) | |
download | ffmpeg-dcbff35199e1596d9d1200e734ef4a4c306e50f1.tar.gz |
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>
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r-- | libavcodec/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 1c6e148424..875670b87e 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -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 |