at master 2.8 kB view raw
1diff --git a/ffmpeg/_probe.py b/ffmpeg/_probe.py 2index 090d7abf9e..07fb4d9459 100644 3--- a/ffmpeg/_probe.py 4+++ b/ffmpeg/_probe.py 5@@ -4,7 +4,7 @@ 6 from ._utils import convert_kwargs_to_cmd_line_args 7 8 9-def probe(filename, cmd='ffprobe', timeout=None, **kwargs): 10+def probe(filename, cmd='@ffmpeg@/bin/ffprobe', timeout=None, **kwargs): 11 """Run ffprobe on the specified file and return a JSON representation of the output. 12 13 Raises: 14diff --git a/ffmpeg/_run.py b/ffmpeg/_run.py 15index f42d1d7309..d3e1df9c80 100644 16--- a/ffmpeg/_run.py 17+++ b/ffmpeg/_run.py 18@@ -174,7 +174,7 @@ 19 20 21 @output_operator() 22-def compile(stream_spec, cmd='ffmpeg', overwrite_output=False): 23+def compile(stream_spec, cmd='@ffmpeg@/bin/ffmpeg', overwrite_output=False): 24 """Build command-line for invoking ffmpeg. 25 26 The :meth:`run` function uses this to build the command line 27@@ -195,7 +195,7 @@ 28 @output_operator() 29 def run_async( 30 stream_spec, 31- cmd='ffmpeg', 32+ cmd='@ffmpeg@/bin/ffmpeg', 33 pipe_stdin=False, 34 pipe_stdout=False, 35 pipe_stderr=False, 36@@ -299,7 +299,7 @@ 37 @output_operator() 38 def run( 39 stream_spec, 40- cmd='ffmpeg', 41+ cmd='@ffmpeg@/bin/ffmpeg', 42 capture_stdout=False, 43 capture_stderr=False, 44 input=None, 45diff --git a/ffmpeg/tests/test_ffmpeg.py b/ffmpeg/tests/test_ffmpeg.py 46index 8dbc271a79..168e662e8d 100644 47--- a/ffmpeg/tests/test_ffmpeg.py 48+++ b/ffmpeg/tests/test_ffmpeg.py 49@@ -26,7 +26,7 @@ 50 BOGUS_INPUT_FILE = os.path.join(SAMPLE_DATA_DIR, 'bogus') 51 52 53-subprocess.check_call(['ffmpeg', '-version']) 54+subprocess.check_call(['@ffmpeg@/bin/ffmpeg', '-version']) 55 56 57 def test_escape_chars(): 58@@ -450,12 +450,12 @@ 59 60 61 # def test_version(): 62-# subprocess.check_call(['ffmpeg', '-version']) 63+# subprocess.check_call(['@ffmpeg@/bin/ffmpeg', '-version']) 64 65 66 def test__compile(): 67 out_file = ffmpeg.input('dummy.mp4').output('dummy2.mp4') 68- assert out_file.compile() == ['ffmpeg', '-i', 'dummy.mp4', 'dummy2.mp4'] 69+ assert out_file.compile() == ['@ffmpeg@/bin/ffmpeg', '-i', 'dummy.mp4', 'dummy2.mp4'] 70 assert out_file.compile(cmd='ffmpeg.old') == [ 71 'ffmpeg.old', 72 '-i', 73@@ -530,7 +530,7 @@ 74 @pytest.mark.parametrize('capture_stdout', [True, False]) 75 @pytest.mark.parametrize('capture_stderr', [True, False]) 76 def test__run__error(mocker, capture_stdout, capture_stderr): 77- mocker.patch.object(ffmpeg._run, 'compile', return_value=['ffmpeg']) 78+ mocker.patch.object(ffmpeg._run, 'compile', return_value=['@ffmpeg@/bin/ffmpeg']) 79 stream = _get_complex_filter_example() 80 with pytest.raises(ffmpeg.Error) as excinfo: 81 out, err = ffmpeg.run( 82@@ -724,7 +724,7 @@ 83 'pipe:1', 84 ] 85 86- cmd = ['ffmpeg'] + args 87+ cmd = ['@ffmpeg@/bin/ffmpeg'] + args 88 p = subprocess.Popen( 89 cmd, 90 stdin=subprocess.PIPE,