From patchwork Wed Aug 1 23:00:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Holljes X-Patchwork-Id: 9862 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1384337jad; Wed, 1 Aug 2018 16:06:13 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeMp67rP9SceIIgsfprOxa/tJNp/kU7kGgHGxHlf1uHF84m0BJeu6AD84eFm7NbaA7D3zpp X-Received: by 2002:adf:f210:: with SMTP id p16-v6mr196463wro.184.1533164773654; Wed, 01 Aug 2018 16:06:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1533164773; cv=none; d=google.com; s=arc-20160816; b=H6WC6HnIFwZkyUFuFkL2h7Jw8iXp91KhPQ67bgS0E9Bd3nYPDt7RxY7alusYZIuBfr /kyqXv3DxKKN+J5aKsSkuMLCjh6ZLy6pVtkgX6scTFgckIxw/ls/o6WYCDN/swvDaN1O hmDj5T3UOHpfIJx9zjrCczqG7JsQZYWSvse0kmU4tBcEAyn9TKkTbew1aIHI7fCjDO3S AgTRCGGFZbA216V3poqbF19xXEVqM/PjOdNynjpuMwXEGTyYB0GQJ7Ga7mZfoHot0VXr 4dEp2WV1+Mt5HVfDg/5aip4PDoQuuz07ueMNbq3o21CZkjglNHBgNWGeNVquh8Afe+G8 bW0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=921sFUPjjLMizxenEwSjd3CRDOzmkXDHsZngWcR6v2I=; b=VrRiMgiQCFKhKYGwOuP73ENUDp0sT5kW2BY7T7/sXb7XhEM2NgI9piXePc2d1XmrDn BMqr55d/sk2oBsaITl5VBvidDjz3dFSrAz7wO0Mn3oP9eJtDi4Nv2m+TYtiu/3HrltKx jYq7qE/dAJQMvYweQB2cB+jQRPEE1ljn+XWPxYyD/fNmS/Vq6/fDHQlqur8G0hv00YKp lA/f8nBtGqqETpRoc5LRcpylWFzARWVzvsPfRxnAnb8BKxhKySHdW8R1vsX/Rz9XSxx+ jdcZnb/fdVXBHjV8YRkoJWFOfeiumB4dAbgrKPqKLOOfX4de9KEK2okHfWai9eWa8Uo4 6Rsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=Uh3H8M38; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id h1-v6si136470wrw.378.2018.08.01.16.06.13; Wed, 01 Aug 2018 16:06:13 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@googlemail.com header.s=20161025 header.b=Uh3H8M38; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=googlemail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F07B368A55E; Thu, 2 Aug 2018 02:05:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0B42468A2DE for ; Thu, 2 Aug 2018 02:05:48 +0300 (EEST) Received: by mail-wm0-f68.google.com with SMTP id r24-v6so752604wmh.0 for ; Wed, 01 Aug 2018 16:06:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=HICGw1Fv75jT7TBq+NRkBwkDyy4FGt1l5DkoRYn4hG4=; b=Uh3H8M38cvDK/6rJxaadhopFHHP5EYoH2w4FeyFmw/7viFI5QXZzK2LBijVmQpb8CH 0EFMTR0xlwLWdPPfRwauWfREDTn3xHIMwURJ7RrfCDLs+gHp457hTHBVHnclzs9Sfvn5 FbHOYtiuJwuq4Aw4RZWoG3IxyYwgdrA9yfchQvUeCFwT9P7AH8h4FAOzhKObXCczRAdg w5nSBsq4mK/cZ+CRZHX9r55GNFuXKwxBQgXAJHdq2w0X6z+BOknjz9zv1r1k1Pl09vSG nBvXV17EmbstsmLYbb/VTAR5NkrV3QA+K672I1lgNoJld7SCEzyargfNN6SvaFepSAKd URvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=HICGw1Fv75jT7TBq+NRkBwkDyy4FGt1l5DkoRYn4hG4=; b=pjFMx0g9Ih7LrE+uqtRmGQWxsCQuYBoedtNpb2XXqNmjWf9T2WwcHzZGYUI93S/jMn Hdx3gXHQr5t82tFiqRdhIJn0lvnRQkc5W0aZStZDsx3pzH7El+pe8fdBWzizBPHrfdU9 W+Kk6jzix54IYdf3hY4fZb650wF3fy8+5JXPwslFSjcqvPuD1gwzbff/yNP13AOcXxvb y3GwVA3f7R7pM3InnfUuA6rS78QQ2feSUZ8zWzQ5oTBhV8dZJ1CBVnpW/W71w/KbOrZX MfuBfV3/RQyc6+COqE1tgJCXwo9HavYIBDhpVlEFLVEXwSUXCzqUX2yPnGw+LlOSQzj6 U98A== X-Gm-Message-State: AOUpUlHv/gekWGaOBfZRo6MP085lSHozvP9AO721ntWHexT0FOUBa5/S +F1/ZROyD/7VitsaBlXnzsGkfAbh X-Received: by 2002:a1c:1609:: with SMTP id 9-v6mr214517wmw.12.1533164433181; Wed, 01 Aug 2018 16:00:33 -0700 (PDT) Received: from localhost.localdomain ([46.5.2.0]) by smtp.gmail.com with ESMTPSA id e133-v6sm101201wma.33.2018.08.01.16.00.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 01 Aug 2018 16:00:32 -0700 (PDT) From: Stephan Holljes To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Aug 2018 01:00:21 +0200 Message-Id: <1533164424-12395-5-git-send-email-klaxa1337@googlemail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1533164424-12395-1-git-send-email-klaxa1337@googlemail.com> References: <1533164424-12395-1-git-send-email-klaxa1337@googlemail.com> Subject: [FFmpeg-devel] [PATCH 4/7] ffserver.c: replace server logging context with NULL, since libmicrohttpd's daemon context is not known to libavutil. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Stephan Holljes MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Stephan Holljes --- ffserver.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ffserver.c b/ffserver.c index 9cc501c..59c1b4d 100644 --- a/ffserver.c +++ b/ffserver.c @@ -490,11 +490,11 @@ void *accept_thread(void *arg) for (i = 0; i < config->nb_streams; i++) { if (info->pubs[i]) { publisher_gen_status_json(info->pubs[i], status); - av_log(server, AV_LOG_INFO, status); + av_log(NULL, AV_LOG_INFO, status); } } client = NULL; - av_log(server, AV_LOG_DEBUG, "Accepting new clients.\n"); + av_log(NULL, AV_LOG_DEBUG, "Accepting new clients.\n"); reply_code = 200; if ((ret = info->httpd->accept(server, &client, NULL)) < 0) { @@ -503,7 +503,7 @@ void *accept_thread(void *arg) } else if (ret == HTTPD_CLIENT_ERROR) { info->httpd->close(server, client); } - av_log(server, AV_LOG_WARNING, "Error during accept, retrying.\n"); + av_log(NULL, AV_LOG_WARNING, "Error during accept, retrying.\n"); continue; } @@ -666,7 +666,7 @@ void *accept_thread(void *arg) ofmt_ctx->pb = client_ctx; ret = avformat_write_header(ofmt_ctx, &mkvopts); if (ret < 0) { - av_log(client, AV_LOG_ERROR, "Could not write header to client: %s.\n", av_err2str(ret)); + av_log(client_ctx, AV_LOG_ERROR, "Could not write header to client: %s.\n", av_err2str(ret)); publisher_cancel_reserve(pub); info->httpd->close(server, client); avformat_free_context(ofmt_ctx); @@ -679,7 +679,7 @@ void *accept_thread(void *arg) ofmt_ctx = NULL; } - av_log(server, AV_LOG_INFO, "Shutting down http server.\n"); + av_log(NULL, AV_LOG_INFO, "Shutting down http server.\n"); info->httpd->shutdown(server); av_log(NULL, AV_LOG_INFO, "Shut down http server.\n"); return NULL;