From 20566eb0f0e3b0f538bcf68fca42e67afaa0dec6 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Sun, 30 Oct 2011 17:59:01 +0100
Subject: Replace outdated references to ffmpeg tool with avconv.

---
 avserver.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'avserver.c')

diff --git a/avserver.c b/avserver.c
index cb8f41f509..fb719e245f 100644
--- a/avserver.c
+++ b/avserver.c
@@ -223,8 +223,8 @@ typedef struct FFStream {
     char title[512];
     char copyright[512];
     char comment[512];
-    pid_t pid;  /* Of ffmpeg process */
-    time_t pid_start;  /* Of ffmpeg process */
+    pid_t pid;  /* of avconv process */
+    time_t pid_start;  /* of avconv process */
     char **child_argv;
     struct FFStream *next;
     unsigned bandwidth; /* bandwidth, in kbits/s */
@@ -474,7 +474,7 @@ static void start_children(FFStream *feed)
                     slash = pathname;
                 else
                     slash++;
-                strcpy(slash, "ffmpeg");
+                strcpy(slash, "avconv");
 
                 http_log("Launch commandline: ");
                 http_log("%s ", pathname);
-- 
cgit v1.2.3