| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-04 11:25:02 (GMT) |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-03-04 11:25:02 (GMT) |
| commit | 03148fd1743fca98c2f4b5920b796f381e820045 (patch) | |
| tree | d8e60307b96473352ed7dcd74f3c90e826512be5 | |
| parent | 523b12affc0083f0282a80a8d12c75c16b6af604 (diff) | |
| download | ffmpeg-03148fd1743fca98c2f4b5920b796f381e820045.zip ffmpeg-03148fd1743fca98c2f4b5920b796f381e820045.tar.gz ffmpeg-03148fd1743fca98c2f4b5920b796f381e820045.tar.bz2 | |
buildsys: only include log2_tab per library for shared builds
Fix linking failures with -all_load due to multiple log2_tabs
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
| -rw-r--r-- | libavcodec/Makefile | 2 | ||||
| -rw-r--r-- | libavformat/Makefile | 2 | ||||
| -rw-r--r-- | libswresample/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 52282e3..dc065a5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -25,7 +25,6 @@ OBJS = allcodecs.o \ fmtconvert.o \ imgconvert.o \ jrevdct.o \ - log2_tab.o \ mathtables.o \ options.o \ parser.o \ @@ -70,6 +69,7 @@ OBJS-$(CONFIG_MPEGVIDEOENC) += mpegvideo_enc.o mpeg12data.o \ OBJS-$(CONFIG_RANGECODER) += rangecoder.o RDFT-OBJS-$(CONFIG_HARDCODED_TABLES) += sin_tables.o OBJS-$(CONFIG_RDFT) += rdft.o $(RDFT-OBJS-yes) +OBJS-$(CONFIG_SHARED) += log2_tab.o OBJS-$(CONFIG_SINEWIN) += sinewin.o OBJS-$(CONFIG_VAAPI) += vaapi.o OBJS-$(CONFIG_VDPAU) += vdpau.o diff --git a/libavformat/Makefile b/libavformat/Makefile index 03d7e23..73ada77 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -13,7 +13,6 @@ OBJS = allformats.o \ cutils.o \ id3v1.o \ id3v2.o \ - log2_tab.o \ metadata.o \ mux.o \ options.o \ @@ -48,6 +47,7 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \ rtpdec_xiph.o \ srtp.o OBJS-$(CONFIG_RTPENC_CHAIN) += rtpenc_chain.o rtp.o +OBJS-$(CONFIG_SHARED) += log2_tab.o # muxers/demuxers OBJS-$(CONFIG_A64_MUXER) += a64.o rawenc.o diff --git a/libswresample/Makefile b/libswresample/Makefile index 9d9f10c..0b75bd0 100644 --- a/libswresample/Makefile +++ b/libswresample/Makefile @@ -8,11 +8,11 @@ HEADERS = swresample.h \ OBJS = audioconvert.o \ dither.o \ - log2_tab.o \ rematrix.o \ resample.o \ swresample.o \ OBJS-$(CONFIG_LIBSOXR) += soxr_resample.o +OBJS-$(CONFIG_SHARED) += log2_tab.o TESTPROGS = swresample |