diff options
| author | Diego Pettenò <flameeyes@gmail.com> | 2010-07-21 12:37:37 +0000 |
|---|---|---|
| committer | Diego Pettenò <flameeyes@gmail.com> | 2010-07-21 12:37:37 +0000 |
| commit | 3fc548df28f765c9f649248e1e14079120e7c74e (patch) | |
| tree | dc8d61d600d5e333ff5d683530794021d2d8bcb4 /libavcodec/Makefile | |
| parent | b3dce4b9bff2e542113b8e434b9c011f344744cb (diff) | |
| download | ffmpeg-3fc548df28f765c9f649248e1e14079120e7c74e.tar.gz | |
Make ff_inverse stay with libavutil, and optional copy it to libavcodec.
The ff_inverse table is used by FASTDIV macro, defined in libavutil, but up
to now the table was defined only in libavcodec.
After this change, the main copy of ff_inverse is part of libavutil (just
like FASTDIV), but if CONFIG_SMALL is unset, then a different copy is made
available to libavcodec, to avoid the performance penalty of using an
external look up table.
Dynamic linking works, because the libraries are linked with -Bsymbolic, so
the local copy of the symbol has priority over the external; static linking
works because the table is on a standalone object file in both libraries,
so the linker is able to discard one of the two.
Tested on Linux/x86-64 and Mac OS X/x86-64.
Originally committed as revision 24383 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/Makefile')
| -rw-r--r-- | libavcodec/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 965948c66c..36a7dc533f 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -609,6 +609,12 @@ OBJS-$(HAVE_W32THREADS) += w32thread.o OBJS-$(CONFIG_MLIB) += mlib/dsputil_mlib.o \ +# inverse.o contains the ff_inverse table definition, which is used by +# the FASTDIV macro (from libavutil); since referencing the external +# table has a negative effect on performance, copy it in libavcodec as +# well. +OBJS-$(!CONFIG_SMALL) += inverse.o + -include $(SUBDIR)$(ARCH)/Makefile SKIPHEADERS = %_tablegen.h |