Merge pull request kkroening#123 from laurentalacoque/master

kkroening · web-flow · commit d47890aebd51 · 2018-09-10T19:18:30.000-05:00
Added ffmpeg.probe 'cmd' argument
diff --git a/ffmpeg/_probe.py b/ffmpeg/_probe.py
@@ -3,7 +3,7 @@
 from ._run import Error
 
 
-def probe(filename):
+def probe(filename, cmd='ffprobe'):
     """Run ffprobe on the specified file and return a JSON representation of the output.
 
     Raises:
@@ -12,7 +12,7 @@ def probe(filename):
             The stderr output can be retrieved by accessing the
             ``stderr`` property of the exception.
     """
-    args = ['ffprobe', '-show_format', '-show_streams', '-of', 'json', filename]
+    args = [cmd, '-show_format', '-show_streams', '-of', 'json', filename]
     p = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     out, err = p.communicate()
     if p.returncode != 0:
