From ccc5d86d0c267ac8f6adeb3eb5280ee32bad9a02 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Wed, 25 Sep 2013 20:31:32 -0700 Subject: x264: Avoid circular dependency with ffmpeg This won't normally be a problem, but when ffmpeg is updated, it uses x264's library, which has symbol referenced to the old version of ffmpeg. This is only a work-around. If users need lavf/lsws support, they can manually remove it from the x264.mk file. Signed-off-by: Timothy Gu --- src/x264.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/x264.mk b/src/x264.mk index 04f9d20..d4d36e5 100644 --- a/src/x264.mk +++ b/src/x264.mk @@ -22,7 +22,9 @@ define $(PKG)_BUILD --prefix='$(PREFIX)/$(TARGET)' \ --disable-shared \ --enable-static \ - --enable-win32thread + --enable-win32thread \ + --disable-lavf \ # Avoid circular dependency with ffmpeg. Remove if undesired. + --disable-swscale # Avoid circular dependency with ffmpeg. Remove if undesired. $(MAKE) -C '$(1)' -j 1 uninstall $(MAKE) -C '$(1)' -j '$(JOBS)' $(MAKE) -C '$(1)' -j 1 install -- cgit v0.12