forked from 0x2620/pandora
only add target once, add ,to derivatives
This commit is contained in:
parent
2939714154
commit
e3bd260b55
3 changed files with 2 additions and 4 deletions
|
@ -192,7 +192,7 @@ def stream(video, target, profile, info):
|
|||
|
||||
if format == 'webm':
|
||||
cmd += ['-f', 'webm', target]
|
||||
if format == 'mp4':
|
||||
elif format == 'mp4':
|
||||
#mp4 needs postprocessing(qt-faststart), write to temp file
|
||||
cmd += ["%s.mp4"%target]
|
||||
else :
|
||||
|
|
|
@ -913,7 +913,7 @@ class Stream(models.Model):
|
|||
info = fields.DictField(default={})
|
||||
|
||||
def __unicode__(self):
|
||||
return u"%s/%s" % (self.item, self.profile)
|
||||
return u"%s/%s" % (self.item.itemId, self.profile)
|
||||
|
||||
def path(self):
|
||||
return self.item.path(self.profile)
|
||||
|
|
|
@ -162,10 +162,8 @@ VIDEO_PROFILE = '480p.webm'
|
|||
VIDEO_DERIVATIVES = [
|
||||
'96p.webm',
|
||||
'240p.webm',
|
||||
'360p.webm'
|
||||
'96p.mp4',
|
||||
'240p.mp4',
|
||||
'360p.mp4',
|
||||
'480p.mp4',
|
||||
]
|
||||
'''
|
||||
|
|
Loading…
Reference in a new issue