[FFmpeg-cvslog] buildsys: only include log2_tab per library for shared builds
Michael Niedermayer
git at videolan.org
Tue Mar 5 09:21:37 CET 2013
ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Mon Mar 4 12:25:02 2013 +0100| [7c8beec48ce7fa7380e8aab700c7d5f2b579a58e] | committer: Carl Eugen Hoyos
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 at ag.or.at>
(cherry picked from commit 03148fd1743fca98c2f4b5920b796f381e820045)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c8beec48ce7fa7380e8aab700c7d5f2b579a58e
---
libavcodec/Makefile | 2 +-
libavformat/Makefile | 2 +-
libswresample/Makefile | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 3ebb5a8..4bf3ee1 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 \
@@ -69,6 +68,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 7560597..85799d4 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 \
@@ -45,6 +44,7 @@ OBJS-$(CONFIG_RTPDEC) += rdt.o \
rtpdec_vp8.o \
rtpdec_xiph.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
More information about the ffmpeg-cvslog
mailing list