summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2009-09-24 16:30:19 +0000
committerjstebbins <[email protected]>2009-09-24 16:30:19 +0000
commit34a52465b44f6997047809ea9f123587831cd535 (patch)
treea67f2b2c55ffacbac3407e7a1bf4cded99ca73a5 /contrib/ffmpeg
parent0f5140c1d05969ef64be8838602cb98732a0932d (diff)
bump x264 to r1271
make changes required by the x264 api change fix some build issues that the x264 bump exposed git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2836 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg')
-rw-r--r--contrib/ffmpeg/module.defs2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/ffmpeg/module.defs b/contrib/ffmpeg/module.defs
index 2f36ee990..4b8b092e9 100644
--- a/contrib/ffmpeg/module.defs
+++ b/contrib/ffmpeg/module.defs
@@ -30,7 +30,7 @@ FFMPEG.CONFIGURE.extra = \
ifeq (0-cygwin,$(BUILD.cross)-$(BUILD.system))
FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-memalign-hack
FFMPEG.GCC.args.extra = -fno-common
-else ifeq (1-darwin,$(BUILD.cross)-$(BUILD.system))
+else ifeq (darwin,$(BUILD.system))
## section for darwin-archs
FFMPEG.CONFIGURE.extra += --enable-pthreads --enable-cross-compile --arch=$(BUILD.machine)
else ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))