35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
|
---
|
||
|
|
persepolis/scripts/mainwindow.py | 2 +-
|
||
|
|
persepolis/scripts/useful_tools.py | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/persepolis/scripts/mainwindow.py b/persepolis/scripts/mainwindow.py
|
||
|
|
index d21f3f4..a0e3674 100644
|
||
|
|
--- a/persepolis/scripts/mainwindow.py
|
||
|
|
+++ b/persepolis/scripts/mainwindow.py
|
||
|
|
@@ -161,7 +161,7 @@ class CheckVersionsThread(QThread):
|
||
|
|
|
||
|
|
else:
|
||
|
|
pipe = subprocess.Popen(
|
||
|
|
- [ffmpeg_path, '-version'],
|
||
|
|
+ ['ffmpeg', '-version'],
|
||
|
|
stdout=subprocess.PIPE,
|
||
|
|
stdin=subprocess.PIPE,
|
||
|
|
stderr=subprocess.PIPE,
|
||
|
|
diff --git a/persepolis/scripts/useful_tools.py b/persepolis/scripts/useful_tools.py
|
||
|
|
index b780967..31733eb 100644
|
||
|
|
--- a/persepolis/scripts/useful_tools.py
|
||
|
|
+++ b/persepolis/scripts/useful_tools.py
|
||
|
|
@@ -342,7 +342,7 @@ def muxer(parent, video_finder_dictionary):
|
||
|
|
current_directory = os.path.dirname(cwd)
|
||
|
|
ffmpeg_path = os.path.join(current_directory, 'ffmpeg')
|
||
|
|
|
||
|
|
- pipe = subprocess.Popen([ffmpeg_path, '-i', video_file_path,
|
||
|
|
+ pipe = subprocess.Popen(['ffmpeg', '-i', video_file_path,
|
||
|
|
'-i', audio_file_path,
|
||
|
|
'-c', 'copy',
|
||
|
|
'-shortest',
|
||
|
|
--
|
||
|
|
2.39.3 (Apple Git-145)
|
||
|
|
|