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

dont use local ffmpeg if format is not webm

Browse source
This commit is contained in:
j 2014-10-06 10:14:39 +00:00
parent e4c6a671a6
commit ce8803d100
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/models.py
View file

@ -677,7 +677,7 @@ class Stream(models.Model):
def encode(self): def encode(self):
media = self.source.media.path if self.source else self.file.data.path media = self.source.media.path if self.source else self.file.data.path
ffmpeg = ox.file.cmd('ffmpeg') ffmpeg = ox.file.cmd('ffmpeg')
if self.source or ffmpeg == 'ffmpeg': if self.source or ffmpeg == 'ffmpeg' or self.format != 'webm':
ffmpeg = None ffmpeg = None
if not self.media: if not self.media: