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 /libavutil/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 'libavutil/Makefile')
| -rw-r--r-- | libavutil/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/Makefile b/libavutil/Makefile index d290ff91ca..63a48be744 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -75,6 +75,7 @@ OBJS = adler32.o \ lfg.o \ lls.o \ log.o \ + log2.o \ log2_tab.o \ lzo.o \ mathematics.o \ @@ -89,6 +90,7 @@ OBJS = adler32.o \ rc4.o \ samplefmt.o \ sha.o \ + sqrt_tab.o \ time.o \ timecode.o \ tree.o \ |