From 97ed53071770a500f360bb67a6417cc0f16656d8 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Mon, 29 Apr 2013 15:59:48 +0200 Subject: [PATCH] use local ffmpeg path --- pandora_client/client.py | 2 ++ pandora_client/server.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pandora_client/client.py b/pandora_client/client.py index cf0106c..80fa87b 100644 --- a/pandora_client/client.py +++ b/pandora_client/client.py @@ -9,6 +9,7 @@ import sys import requests +import extract class DistributedClient: @@ -39,6 +40,7 @@ class DistributedClient: return False def encode(self, oshash, cmd, output): + cmd[0] = extract.command('ffmpeg') try: p = subprocess.Popen(cmd) r = None diff --git a/pandora_client/server.py b/pandora_client/server.py index e26b239..efde2a9 100644 --- a/pandora_client/server.py +++ b/pandora_client/server.py @@ -131,7 +131,7 @@ class Server(Resource): url = 'http://%s:%s/get/%s' % (request.host.host, request.host.port, oshash) output = '/tmp/%s.%s' % (oshash, self.client.profile) response['cmd'] = extract.video_cmd(url, output, self.client.profile, info) - response['cmd'][0] = 'avconv' + response['cmd'][0] = 'ffmpeg' response['output'] = output self.update_status(oshash, 'active') print oshash, f