From patchwork Sat Mar 11 17:55:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Strasser X-Patchwork-Id: 2886 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp557415vsy; Sat, 11 Mar 2017 09:55:28 -0800 (PST) X-Received: by 10.28.95.85 with SMTP id t82mr3987347wmb.107.1489254928591; Sat, 11 Mar 2017 09:55:28 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i21si4147595wmc.94.2017.03.11.09.55.28; Sat, 11 Mar 2017 09:55:28 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3CC45689A71; Sat, 11 Mar 2017 19:55:11 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.21]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 607F2689A30 for ; Sat, 11 Mar 2017 19:55:04 +0200 (EET) Received: from akuma.local ([134.109.251.187]) by mail.gmx.com (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id 0MTjMy-1cdzpG3K0e-00QVIF for ; Sat, 11 Mar 2017 18:55:18 +0100 Date: Sat, 11 Mar 2017 18:55:17 +0100 From: Alexander Strasser To: ffmpeg-devel@ffmpeg.org Message-ID: <8385a50473a42be245e039a4d34a4047e570f770.1489253704.git.eclipse7@gmx.net> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.24 (2015-08-30) X-Provags-ID: V03:K0:1gpk2Ta+8T3aa91H755lfqfvFdVr+po2l+jCyyvXf+f4wdbfFiv gXLyqzQWOERY1VpAjKfCX4oHyA/J51n/o6kpQBpoW7ECmQyYsh5mLL5uwUaoCtOmr3uRFSX 1RVbf2e/H5o6rdsiEyvZReXOoo4WNCeWUMuZE88Npf3rWzM9aSnT91KcOPwPRNnO7ewTLNp /gceeGvSirCunQP0sEy6g== X-UI-Out-Filterresults: notjunk:1; V01:K0:65LJlzzDDvc=:7DuYJ/NBc5r8h/r/w4pep7 +SZOLNLPNpPvCD8+TQxJUXMPefMCqUUYI8VfXMy6no24jeAoeuw+YYIoZPBCB/c01YBpWmuqF YJYA+H4uorIda3ogwC9VI//w1ZzkpH+7M81gDdilc0QcvC2O7CXdwmS60ETuGe97mhuDDqg2L I+aS9H2e67Ynn0wQWj3gSrx/F+VfuGeqySUl0IfTXrUAUC+RcDFNsUdCSoCFn09IfJ/ebjRuz HttaijczTLiERiBjucrG5lYC/ie+GeyDRIlPtKE6T3t0a9/BfOKgBroXA2VPMN8vcebVRYtop 0wEZ1MOGXK0cvwndgApyGeNd8iG4Ju0IFzmWsduLiTrGIJjVDCJNhXrPZMO8xuYZNgft7xd60 Y7BEaMi/dbGi3Iwi4YIlgi6y5VBwngsTGXJyKPM4oGZG7ixo8nJ7/xBTXpa/8VQ1AgV9RGF/9 YC3WU76XPGe1S5pVDstxgKLHIjB04342MSgPaIhqKnQYj2kywweXBi7zzUU/ws5QqF1IN/HnJ o3QgHEg9EqzYMoVZo6oTysK+PajMnS7Ti0uLJtwXiHQvTN1JAA87T4KZS6C7nJmEfIdSWeQlY xjmzQuNqYcLAgRPAd8MsnzNzYLUjLc9uTzdlSJC+YaMNWKBdfrtiYgQGMsm/w1NgWsGOTSP1W xkECqNsCIF7oisu8FGhniqUAPicKawaMsA4nRKBto8zcfVC0XhUgWpzxIZ3Q/leZmXeZsjKlR 86ppct5Ef+pFhtQ4ihjx0bwPfgh5xOOQuWG4If1CMic9EZg6G6Tr122QNjA= Subject: [FFmpeg-devel] [PATCH 2/2] lavf: Be more explicit in logging white/black list matches 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The current form of the messages indicating matches in the white or black lists seems to be a bit too much relying on context. Make the messages more explicit. This also matches the way codec white list errors are reported. Signed-off-by: Alexander Strasser --- libavformat/avio.c | 4 ++-- libavformat/utils.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index 9020aa9..0e29c61 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -179,12 +179,12 @@ int ffurl_connect(URLContext *uc, AVDictionary **options) (uc->protocol_blacklist && !strcmp(uc->protocol_blacklist, e->value))); if (uc->protocol_whitelist && av_match_list(uc->prot->name, uc->protocol_whitelist, ',') <= 0) { - av_log(uc, AV_LOG_ERROR, "Protocol not on whitelist '%s'!\n", uc->protocol_whitelist); + av_log(uc, AV_LOG_ERROR, "Protocol (%s) not on whitelist '%s'!\n", uc->prot->name, uc->protocol_whitelist); return AVERROR(EINVAL); } if (uc->protocol_blacklist && av_match_list(uc->prot->name, uc->protocol_blacklist, ',') > 0) { - av_log(uc, AV_LOG_ERROR, "Protocol blacklisted '%s'!\n", uc->protocol_blacklist); + av_log(uc, AV_LOG_ERROR, "Protocol (%s) on blacklist '%s'!\n", uc->prot->name, uc->protocol_blacklist); return AVERROR(EINVAL); } diff --git a/libavformat/utils.c b/libavformat/utils.c index 9c8287f..542357e 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -374,7 +374,7 @@ int av_demuxer_open(AVFormatContext *ic) { int err; if (ic->format_whitelist && av_match_list(ic->iformat->name, ic->format_whitelist, ',') <= 0) { - av_log(ic, AV_LOG_ERROR, "Format not on whitelist '%s'\n", ic->format_whitelist); + av_log(ic, AV_LOG_ERROR, "Format (%s) not on whitelist '%s'\n", ic->iformat->name, ic->format_whitelist); return AVERROR(EINVAL); } @@ -554,7 +554,7 @@ int avformat_open_input(AVFormatContext **ps, const char *filename, } if (s->format_whitelist && av_match_list(s->iformat->name, s->format_whitelist, ',') <= 0) { - av_log(s, AV_LOG_ERROR, "Format not on whitelist '%s'\n", s->format_whitelist); + av_log(s, AV_LOG_ERROR, "Format (%s) not on whitelist '%s'\n", s->iformat->name, s->format_whitelist); ret = AVERROR(EINVAL); goto fail; }