Revert "Makefile.ffmpeg: prefer static linking for x264, vpx, vorbis libs to avoid...

This reverts commit 8e876995f352b28dc7ca0f5ad683d82e35b38370.

It does not work..

diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg
index 8fd0c17c60f1536d2b383b99f0d7e0638954a28a..7d6bc7fdb4eacf1b763fbf9384a57c6dbef4ed7c 100644 (file)
--- a/Makefile.ffmpeg
+++ b/Makefile.ffmpeg
@@ -47,7 +47,6 @@ export PATH := $(LIBAVDIR)/build/ffmpeg/bin:$(PATH)
 
 ECFLAGS         = -I$(LIBAVDIR)/build/ffmpeg/include
 ELIBS           = -L$(LIBAVDIR)/build/ffmpeg/lib -ldl
-SLIBS           = -lx264 -lvpx -lvorbisenc -lvorbis -logg
 
 FFMPEG          = ffmpeg-2.4.2
 FFMPEG_TB       = $(FFMPEG).tar.bz2
@@ -240,17 +239,6 @@ $(LIBAVDIR)/$(FFMPEG)/.tvh_build: \
                $(foreach encoder,$(ENCODERS),--enable-encoder=$(encoder)) \
                $(foreach muxer,$(MUXERS),--enable-muxer=$(muxer)) \
                $(foreach bsf,$(BSFS),--enable-bsf=$(bsf))
-       #
-       # Modify EXTRALIBS to link statically at first shot
-       #
-       @{ \
-         libs=$$(cat $(LIBAVDIR)/$(FFMPEG)/config.mak | grep -E "^EXTRALIBS=" | cut -d '=' -f 2-) ; \
-         cat $(LIBAVDIR)/$(FFMPEG)/config.mak | grep -Ev "^EXTRALIBS=" > \
-               $(LIBAVDIR)/$(FFMPEG)/config.mak.new ; \
-         echo "EXTRALIBS=-L$(LIBAVDIR)/build/ffmpeg/lib -Wl,-Bstatic $(SLIBS) -Wl,-Bdynamic $${libs}" > \
-               $(LIBAVDIR)/$(FFMPEG)/config.mak ; \
-         cat $(LIBAVDIR)/$(FFMPEG)/config.mak.new >> $(LIBAVDIR)/$(FFMPEG)/config.mak ; \
-       }
        DESTDIR=$(LIBAVDIR)/build \
                make -C $(LIBAVDIR)/$(FFMPEG) install
        @touch $@