From patchwork Wed Oct 2 06:58:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 15456 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 610F7448168 for ; Wed, 2 Oct 2019 09:58:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4BFBD688147; Wed, 2 Oct 2019 09:58:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from qq.com (smtpbg440.qq.com [183.3.255.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72E51688122 for ; Wed, 2 Oct 2019 09:58:52 +0300 (EEST) X-QQ-mid: bizesmtp28t1569999500t219ye9q Received: from localhost (unknown [47.90.47.25]) by esmtp10.qq.com (ESMTP) with id ; Wed, 02 Oct 2019 14:58:20 +0800 (CST) X-QQ-SSF: 01100000008000K0ZQF1B00A0000000 X-QQ-FEAT: urquFgwuOpxUQjRVl2eDvvCKguGnoaFREKFc6ndnOwLi4wAaZeocRBG8NQevE MbkKi62LiRmagvRIa6nNEhSEj2h07g5rJqg6fygbPbfLjzch1hvWGNz/iPNoGekIVqNkntb l087f2XhqTlOEfSoSR6dVPppRwBgO33o/cMyqHlr2M/tdq+OUbS2jCBJ/z6pG+p+B5j4E9v hp1YvLkA4LWC8sith5EjtL8ocB1QHNOwajzh9QqBUPKsJh2KSKczK9Hc0NlRZpDk70WYkrY 5BYHdGn15qP3fCMCMOSYxN31rSedNtCUbMb4r61QfQySJUMSKwyxH8nSg= X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Wed, 2 Oct 2019 14:58:03 +0800 Message-Id: <20191002065815.30333-2-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty In-Reply-To: <20191002065815.30333-1-lq@chinaffmpeg.org> References: <20191002065815.30333-1-lq@chinaffmpeg.org> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign1 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v2 02/14] avformat/udp: add logging context to log 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: Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Steven Liu --- libavformat/udp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/udp.c b/libavformat/udp.c index cf73d331e0..f4ec148a2f 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -274,7 +274,7 @@ static int udp_set_multicast_sources(URLContext *h, } return 0; #else - av_log(NULL, AV_LOG_ERROR, + av_log(h, AV_LOG_ERROR, "Setting multicast sources only supported for IPv4\n"); return AVERROR(EINVAL); #endif @@ -283,7 +283,7 @@ static int udp_set_multicast_sources(URLContext *h, for (i = 0; i < nb_sources; i++) { struct ip_mreq_source mreqs; if (sources[i].ss_family != AF_INET) { - av_log(NULL, AV_LOG_ERROR, "Source/block address %d is of incorrect protocol family\n", i + 1); + av_log(h, AV_LOG_ERROR, "Source/block address %d is of incorrect protocol family\n", i + 1); return AVERROR(EINVAL); } @@ -298,9 +298,9 @@ static int udp_set_multicast_sources(URLContext *h, include ? IP_ADD_SOURCE_MEMBERSHIP : IP_BLOCK_SOURCE, (const void *)&mreqs, sizeof(mreqs)) < 0) { if (include) - ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_ADD_SOURCE_MEMBERSHIP)"); + ff_log_net_error(h, AV_LOG_ERROR, "setsockopt(IP_ADD_SOURCE_MEMBERSHIP)"); else - ff_log_net_error(NULL, AV_LOG_ERROR, "setsockopt(IP_BLOCK_SOURCE)"); + ff_log_net_error(h, AV_LOG_ERROR, "setsockopt(IP_BLOCK_SOURCE)"); return ff_neterrno(); } }