From: daid <daid303@gmail.com>
Date: Thu, 13 Jun 2013 11:07:01 +0000 (+0200)
Subject: Fix the timelaps ffmpeg path.
X-Git-Tag: 13.06.2~15
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=905bc6c332a898d62e627302fa58b41720ca66b9;p=cura.git

Fix the timelaps ffmpeg path.
---

diff --git a/Cura/gui/util/webcam.py b/Cura/gui/util/webcam.py
index 2d309640..6046e4c5 100644
--- a/Cura/gui/util/webcam.py
+++ b/Cura/gui/util/webcam.py
@@ -36,10 +36,10 @@ def hasWebcamSupport():
 
 def getFFMPEGpath():
 	if platform.system() == "Windows":
-		return os.path.normpath(os.path.join(os.path.split(__file__)[0], "../ffmpeg.exe"))
+		return os.path.normpath(os.path.join(os.path.split(__file__)[0], "../../ffmpeg.exe"))
 	elif os.path.exists('/usr/bin/ffmpeg'):
 		return '/usr/bin/ffmpeg'
-	return os.path.normpath(os.path.join(os.path.split(__file__)[0], "../ffmpeg"))
+	return os.path.normpath(os.path.join(os.path.split(__file__)[0], "../../ffmpeg"))
 
 
 class webcam(object):