use local ffmpeg path

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

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