diff --git a/ffmpeg/_probe.py b/ffmpeg/_probe.py index 090d7ab..45e604d 100644 --- a/ffmpeg/_probe.py +++ b/ffmpeg/_probe.py @@ -4,7 +4,7 @@ from ._run import Error from ._utils import convert_kwargs_to_cmd_line_args -def probe(filename, cmd='ffprobe', timeout=None, **kwargs): +def probe(filename, cmd='ffprobe', timeout=None, capture_stderr=False, **kwargs): """Run ffprobe on the specified file and return a JSON representation of the output. Raises: @@ -24,6 +24,8 @@ def probe(filename, cmd='ffprobe', timeout=None, **kwargs): out, err = p.communicate(**communicate_kwargs) if p.returncode != 0: raise Error('ffprobe', out, err) + if capture_stderr: + return json.loads(out.decode('utf-8')), err return json.loads(out.decode('utf-8'))