decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

only use melt if USE_MELT is set

Browse source
This commit is contained in:
j 2014-09-25 16:18:13 +02:00
parent 9ebedeb664
commit 5b25411a60
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/archive/extract.py
View file

@ -342,7 +342,7 @@ def frame(video, frame, position, height=128, redo=False, info=None):
if settings.USE_MELT: if settings.USE_MELT:
cmd = melt_frame_cmd(video, frame, position, height, info) cmd = melt_frame_cmd(video, frame, position, height, info)
else: else:
cmd = melt_frame_cmd(video, frame, position, height) cmd = avconv_frame_cmd(video, frame, position, height)
else: else:
cmd = ['oxframe', '-i', video, '-o', frame, cmd = ['oxframe', '-i', video, '-o', frame,
'-p', str(position), '-y', str(height)] '-p', str(position), '-y', str(height)]