# HG changeset patch # User Thierry Florac # Date 1441724434 -7200 # Node ID b930c820b6cd4d742768f0c30e0d4f04dfc9374c # Parent b78dab1930439df095f45e5f91b4066171d4dadb Added 'ffprobe' command line handler options diff -r b78dab193043 -r b930c820b6cd src/pyams_media/ffbase.py --- a/src/pyams_media/ffbase.py Tue Sep 08 16:59:44 2015 +0200 +++ b/src/pyams_media/ffbase.py Tue Sep 08 17:00:34 2015 +0200 @@ -151,9 +151,9 @@ for i in range(0, len(input) * 2, 2): input.insert(i, "-i") if self.__ffmpeg__ == 'ffprobe': - input.extend(['-show_streams', '-print_format', 'json']) + input.extend(['-show_format', '-show_streams', '-print_format', 'json']) probe = self.__exec__(*input)[0] # stdout - metadata.extend(json.loads(probe.decode()).get('streams', [])) + metadata = json.loads(probe.decode()) else: lines = self.__exec__(*input)[1] # stderr for line in lines.split(b'\n'):