diff options
| author | Tony Theodore <tonyt@logyst.com> | 2013-09-28 04:11:46 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2013-09-28 04:11:46 (GMT) |
| commit | ca7e78d17e5e74030e36f8eb30d99a3e3b3a9e83 (patch) | |
| tree | f510d386dc7b565026e64683ec08cf4ada9ed939 | |
| parent | da9bd330c0600fa8ae7924c69a060e8ea3fbf439 (diff) | |
| parent | ccc5d86d0c267ac8f6adeb3eb5280ee32bad9a02 (diff) | |
| download | mxe-ca7e78d17e5e74030e36f8eb30d99a3e3b3a9e83.zip mxe-ca7e78d17e5e74030e36f8eb30d99a3e3b3a9e83.tar.gz mxe-ca7e78d17e5e74030e36f8eb30d99a3e3b3a9e83.tar.bz2 | |
Merge pull request #246 from TimothyGu/urgent
package x264: Avoid circular dependency with ffmpeg
| -rw-r--r-- | src/x264.mk | 4 |
1 files changed, 3 insertions, 1 deletions
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 |