[FFmpeg-cvslog] r13950 - trunk/ffserver.c
stefano
subversion
Tue Jun 24 23:26:20 CEST 2008
Author: stefano
Date: Tue Jun 24 23:26:20 2008
New Revision: 13950
Log:
Make ffserver show each launched commandline just before to launch
them rather than print them when parsing the configuration file. This
way those commandlines are not showed anymore in no-launch mode.
Modified:
trunk/ffserver.c
Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c (original)
+++ trunk/ffserver.c Tue Jun 24 23:26:20 2008
@@ -407,6 +407,23 @@ static void start_children(FFStream *fee
char *slash;
int i;
+ av_strlcpy(pathname, my_program_name, sizeof(pathname));
+
+ slash = strrchr(pathname, '/');
+ if (!slash)
+ slash = pathname;
+ else
+ slash++;
+ strcpy(slash, "ffmpeg");
+
+ if (ffserver_debug) {
+ fprintf(stdout, "Launch commandline: ");
+ fprintf(stdout, "%s ", pathname);
+ for (i = 1; feed->child_argv[i] && feed->child_argv[i][0]; i++)
+ fprintf(stdout, "%s ", feed->child_argv[i]);
+ fprintf(stdout, "\n");
+ }
+
for (i = 3; i < 256; i++)
close(i);
@@ -420,15 +437,6 @@ static void start_children(FFStream *fee
}
}
- av_strlcpy(pathname, my_program_name, sizeof(pathname));
-
- slash = strrchr(pathname, '/');
- if (!slash)
- slash = pathname;
- else
- slash++;
- strcpy(slash, "ffmpeg");
-
/* This is needed to make relative pathnames work */
chdir(my_program_dir);
@@ -3883,15 +3891,6 @@ static int parse_ffconfig(const char *fi
(my_http_addr.sin_addr.s_addr == INADDR_ANY) ? "127.0.0.1" :
inet_ntoa(my_http_addr.sin_addr),
ntohs(my_http_addr.sin_port), feed->filename);
-
- if (ffserver_debug)
- {
- int j;
- fprintf(stdout, "Launch commandline: ");
- for (j = 0; j <= i; j++)
- fprintf(stdout, "%s ", feed->child_argv[j]);
- fprintf(stdout, "\n");
- }
}
} else if (!strcasecmp(cmd, "ReadOnlyFile")) {
if (feed) {
More information about the ffmpeg-cvslog
mailing list