summaryrefslogtreecommitdiff
path: root/avserver.c
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2011-10-30 17:59:01 +0100
committerDiego Biurrun <diego@biurrun.de>2011-11-02 10:42:54 +0100
commit20566eb0f0e3b0f538bcf68fca42e67afaa0dec6 (patch)
treed06fd70d43d1d8ad060f36c02861579ffdca5bfd /avserver.c
parent124e28847b95a70724399c8473dd778b5c4c8ffc (diff)
downloadffmpeg-20566eb0f0e3b0f538bcf68fca42e67afaa0dec6.tar.gz
Replace outdated references to ffmpeg tool with avconv.
Diffstat (limited to 'avserver.c')
-rw-r--r--avserver.c6
1 files changed, 3 insertions, 3 deletions
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);