vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Mon Oct 19 18:59:16 2015 +0200| [1f99b7703507f1a47de18fcfb51d1fb5916c38bb] | committer: Jean-Baptiste Kempf
Revert "contrib: pass the LD we use to ffmpeg" This reverts commit fabb0362f126c14df679ca0e4fadeb6b85d67881. For some reasons, this was breaking Android toolchains > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1f99b7703507f1a47de18fcfb51d1fb5916c38bb --- contrib/src/ffmpeg/rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 2ee8be5..032d66a 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -170,7 +170,7 @@ ifeq ($(call need_pkg,"libavcodec >= 55.0.0 libavformat >= 53.21.0 libswscale"), PKGS_FOUND += ffmpeg endif -FFMPEGCONF += --nm="$(NM)" --ar="$(AR)" --ld="$(LD)" +FFMPEGCONF += --nm="$(NM)" --ar="$(AR)" $(TARBALLS)/ffmpeg-$(HASH).tar.xz: $(call download_git,$(FFMPEG_GITURL),,$(HASH)) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
