0x2620/pandora_client
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

do not set -ac if audiochannels is None

Browse source
This commit is contained in:
j 2016-08-04 21:41:08 +02:00
parent bc6579b2ab
commit bb8f91bbd8
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pandora_client/extract.py
View file

@ -246,7 +246,7 @@ def video_cmd(video, target, profile, info):
n = 0 n = 0
else: else:
n = 1 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 \ if len(info['audio']) == 2 \
and len(filter(None, [a['channels'] == 1 or None for a in info['audio']])) == 2: and len(filter(None, [a['channels'] == 1 or None for a in info['audio']])) == 2:
video_settings += [ video_settings += [
@ -261,12 +261,11 @@ def video_cmd(video, target, profile, info):
if mono_mix: if mono_mix:
ac = 2 ac = 2
else: else:
ac = info['audio'][0].get('channels', audiochannels) ac = info['audio'][0].get('channels')
if audiochannels: if not ac:
if ac:
ac = min(ac, audiochannels)
else:
ac = audiochannels ac = audiochannels
if audiochannels:
ac = min(ac, audiochannels)
audio_settings += ['-ac', str(ac)] audio_settings += ['-ac', str(ac)]
if audiobitrate: if audiobitrate:
audio_settings += ['-ab', audiobitrate] audio_settings += ['-ab', audiobitrate]