]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
always use stdout to log when running in debug mode
authorbcoudurier <bcoudurier@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 21 Jun 2008 03:34:18 +0000 (03:34 +0000)
committerbcoudurier <bcoudurier@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Sat, 21 Jun 2008 03:34:18 +0000 (03:34 +0000)
git-svn-id: file:///var/local/repositories/ffmpeg/trunk@13846 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

ffserver.c

index de447288a47779b8aec42f75d8170194676d9516..cec0e824259519b18a349d7ecfd6a50fb908ae31 100644 (file)
@@ -3791,7 +3791,8 @@ static int parse_ffconfig(const char *filename)
             } else
                 max_bandwidth = llval;
         } else if (!strcasecmp(cmd, "CustomLog")) {
-            get_arg(logfilename, sizeof(logfilename), &p);
+            if (!ffserver_debug)
+                get_arg(logfilename, sizeof(logfilename), &p);
         } else if (!strcasecmp(cmd, "<Feed")) {
             /*********************************************/
             /* Feed related options */
@@ -4392,6 +4393,7 @@ static void opt_debug()
 {
     ffserver_debug = 1;
     ffserver_daemon = 0;
+    logfilename[0] = '-';
 }
 
 static void opt_show_help(void)