Merge pull request #246 from TimothyGu/urgent

package x264: Avoid circular dependency with ffmpeg
11 years ago · ca7e78d17e
parent da9bd330c0 ccc5d86d0c
commit ca7e78d17e
1 changed files with 3 additions and 1 deletions
--- 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