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

only add target once, add ,to derivatives

Browse source
This commit is contained in:
j 2011-03-26 15:18:21 +01:00
parent 2939714154
commit e3bd260b55
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/archive/extract.py
View file

@ -192,7 +192,7 @@ def stream(video, target, profile, info):
if format == 'webm': if format == 'webm':
cmd += ['-f', 'webm', target] cmd += ['-f', 'webm', target]
if format == 'mp4': elif format == 'mp4':
#mp4 needs postprocessing(qt-faststart), write to temp file #mp4 needs postprocessing(qt-faststart), write to temp file
cmd += ["%s.mp4"%target] cmd += ["%s.mp4"%target]
else : else :

2
pandora/item/models.py
View file

@ -913,7 +913,7 @@ class Stream(models.Model):
info = fields.DictField(default={}) info = fields.DictField(default={})
def __unicode__(self): def __unicode__(self):
return u"%s/%s" % (self.item, self.profile) return u"%s/%s" % (self.item.itemId, self.profile)
def path(self): def path(self):
return self.item.path(self.profile) return self.item.path(self.profile)

2
pandora/settings.py
View file

@ -162,10 +162,8 @@ VIDEO_PROFILE = '480p.webm'
VIDEO_DERIVATIVES = [ VIDEO_DERIVATIVES = [
'96p.webm', '96p.webm',
'240p.webm', '240p.webm',
'360p.webm'
'96p.mp4', '96p.mp4',
'240p.mp4', '240p.mp4',
'360p.mp4',
'480p.mp4', '480p.mp4',
] ]
''' '''