chiark / gitweb /
Fix the timelaps ffmpeg path.
authordaid <daid303@gmail.com>
Thu, 13 Jun 2013 11:07:01 +0000 (13:07 +0200)
committerdaid <daid303@gmail.com>
Thu, 13 Jun 2013 11:07:01 +0000 (13:07 +0200)
Cura/gui/util/webcam.py

index 2d3096403e8ad51ebec8f3e4c35b140a682778c3..6046e4c5c356d22f19e5e90117babb97ba96b5f8 100644 (file)
@@ -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):