use Firefogg ffmpeg for direct uploads, to work around issues with 5.1 audio

2013-10-21 11:55:10 +02:00 · 2013-10-21 11:55:10 +02:00 · 1ac76c99df
commit 1ac76c99df
parent 7329d13324
2 changed files with 8 additions and 3 deletions
--- a/pandora/archive/models.py
+++ b/pandora/archive/models.py
@ -578,7 +578,10 @@ class Stream(models.Model):
                self.media.name = self.path(self.name())
            target = self.media.path
            info = ox.avinfo(media)
-            if extract.stream(media, target, self.name(), info):
+            ffmpeg = ox.file.cmd('ffmpeg')
+            if ffmpeg == 'ffmpeg':
+                ffmpeg = None
+            if extract.stream(media, target, self.name(), info, ffmpeg):
                self.available = True
            else:
                self.media = None