diff options
| author | jstebbins <[email protected]> | 2010-01-21 04:39:58 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-01-21 04:39:58 +0000 |
| commit | e67bbc820dcae0c2bbdbfc5cd24d2b8495285d0a (patch) | |
| tree | 180cb87a257d888e254e8b39c683e1ebcfb7ba6f /contrib | |
| parent | c5f4eea4c283771274b22ccf80fbb2af7e6f681f (diff) | |
fix building x264 on mingw
x264 now tries to link to lavf if it thinks it can
explicitely disable lavf, avs and ffms support
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3079 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/x264/module.defs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs index 85f7e7212..8321d9646 100644 --- a/contrib/x264/module.defs +++ b/contrib/x264/module.defs @@ -12,6 +12,7 @@ X264.CONFIGURE.extra = --disable-mp4-output ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) X264.CONFIGURE.extra += --enable-pthread --cross-prefix=$(BUILD.spec)- + X264.CONFIGURE.extra += --disable-avs-input --disable-lavf-input --disable-ffms-input X264.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver ?extra)" X264.CONFIGURE.env.LDFLAGS = LDFLAGS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver)" else |