summaryrefslogtreecommitdiff
authorMichael Niedermayer <michaelni@gmx.at>2012-11-27 13:41:41 (GMT)
committer Michael Niedermayer <michaelni@gmx.at>2012-11-27 13:41:41 (GMT)
commitc2c1726847fe3a043762062db40774bf0cc434c3 (patch)
tree37f8ae08139152c856634c342945a01f3f7205a9
parent4063bb212e18a0dac17133905526b09b4fab5415 (diff)
downloadffmpeg-c2c1726847fe3a043762062db40774bf0cc434c3.zip
ffmpeg-c2c1726847fe3a043762062db40774bf0cc434c3.tar.gz
ffmpeg-c2c1726847fe3a043762062db40774bf0cc434c3.tar.bz2
ffserver remove CONFIG_NOCUTILS check
Nothing sets CONFIG_NOCUTILS, i also dont remember anything setting it in the past. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat
-rw-r--r--ffserver.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ffserver.c b/ffserver.c
index b54105f..3af481d 100644
--- a/ffserver.c
+++ b/ffserver.c
@@ -2045,7 +2045,7 @@ static void compute_status(HTTPContext *c)
if (stream->pid) {
avio_printf(pb, "Running as pid %d.\n", stream->pid);
-#if defined(linux) && !defined(CONFIG_NOCUTILS)
+#if defined(linux)
{
FILE *pid_stat;
char ps_cmd[64];