summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2010-04-25 21:15:43 +0000
committerjstebbins <[email protected]>2010-04-25 21:15:43 +0000
commitc22e82ad0081856466a92a6e47a72b3ea9b5628c (patch)
tree4118bfdb4913105820b98e7317021704c8f39faa /make
parente6ba7dc071b0b1f070b7f92e3b30eab1ee00a0b5 (diff)
bump ffmpeg to rev 22950
offset ffmpeg seeks by value of initial timestamp since it can be non-zero catch pix fmt that is unsupported by swscale, log it, skip the track use new ffmpeg avg_frame_rate for more accurate framerate estimate git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3267 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'make')
-rw-r--r--make/include/contrib.defs2
1 files changed, 1 insertions, 1 deletions
diff --git a/make/include/contrib.defs b/make/include/contrib.defs
index fcff27356..9edd9389c 100644
--- a/make/include/contrib.defs
+++ b/make/include/contrib.defs
@@ -124,7 +124,7 @@ define import.CONTRIB.defs
$(1).INSTALL.ntargets =
$(1).INSTALL.args = !make @dir !extra !ntargets
- $(1).INSTALL.args.dir = -C $$(1) install
+ $(1).INSTALL.args.dir = -j 1 -C $$(1) install
$(1).INSTALL.mkdirs = $$(CONTRIB.build/)lib/ $$(CONTRIB.build/)include/
$(1).INSTALL.target = $$($(1).build/).stamp.install