[SCM] libav/experimental: always use stdout to log when running in debug mode
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 16:23:50 UTC 2013
The following commit has been merged in the experimental branch:
commit 4e8f77ab617d1347eb6ae97da2fa2efe8a51b5a8
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date: Sat Jun 21 03:34:18 2008 +0000
always use stdout to log when running in debug mode
Originally committed as revision 13846 to svn://svn.ffmpeg.org/ffmpeg/trunk
diff --git a/ffserver.c b/ffserver.c
index de44728..cec0e82 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)
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list