From ce8803d100f59f681dd8b73bbf001d595c2a00da Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Mon, 6 Oct 2014 10:14:39 +0000 Subject: [PATCH] dont use local ffmpeg if format is not webm --- pandora/archive/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pandora/archive/models.py b/pandora/archive/models.py index 945197a7..4dedd064 100644 --- a/pandora/archive/models.py +++ b/pandora/archive/models.py @@ -677,7 +677,7 @@ class Stream(models.Model): def encode(self): media = self.source.media.path if self.source else self.file.data.path ffmpeg = ox.file.cmd('ffmpeg') - if self.source or ffmpeg == 'ffmpeg': + if self.source or ffmpeg == 'ffmpeg' or self.format != 'webm': ffmpeg = None if not self.media: