From bb8f91bbd88af66ff2f5787b26b50bb439c9a923 Mon Sep 17 00:00:00 2001 From: j Date: Thu, 4 Aug 2016 21:41:08 +0200 Subject: [PATCH] do not set -ac if audiochannels is None --- pandora_client/extract.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pandora_client/extract.py b/pandora_client/extract.py index 4c3b7f5..39ab4ff 100644 --- a/pandora_client/extract.py +++ b/pandora_client/extract.py @@ -246,7 +246,7 @@ def video_cmd(video, target, profile, info): n = 0 else: n = 1 - #mix 2 mono channels into stereo(common for fcp dv mov files) + # mix 2 mono channels into stereo(common for fcp dv mov files) if len(info['audio']) == 2 \ and len(filter(None, [a['channels'] == 1 or None for a in info['audio']])) == 2: video_settings += [ @@ -261,13 +261,12 @@ def video_cmd(video, target, profile, info): if mono_mix: ac = 2 else: - ac = info['audio'][0].get('channels', audiochannels) - if audiochannels: - if ac: - ac = min(ac, audiochannels) - else: + ac = info['audio'][0].get('channels') + if not ac: ac = audiochannels - audio_settings += ['-ac', str(ac)] + if audiochannels: + ac = min(ac, audiochannels) + audio_settings += ['-ac', str(ac)] if audiobitrate: audio_settings += ['-ab', audiobitrate] if format == 'mp4':