summaryrefslogtreecommitdiff
path: root/ffserver.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-06-21 03:34:18 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-06-21 03:34:18 +0000
commit4e8f77ab617d1347eb6ae97da2fa2efe8a51b5a8 (patch)
tree593102f11998daf60d9050565dafc15f9944a219 /ffserver.c
parentb43bf8acf167eaa33d67df00cfbff22d4b95fd91 (diff)
always use stdout to log when running in debug mode
Originally committed as revision 13846 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'ffserver.c')
-rw-r--r--ffserver.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c
index de447288a4..cec0e82425 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -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)