From patchwork Sat Mar 11 17:54:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Strasser X-Patchwork-Id: 2887 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp557345vsy; Sat, 11 Mar 2017 09:55:09 -0800 (PST) X-Received: by 10.223.177.151 with SMTP id q23mr20335399wra.65.1489254909043; Sat, 11 Mar 2017 09:55:09 -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 g130si4125533wma.151.2017.03.11.09.55.08; Sat, 11 Mar 2017 09:55:09 -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 B74B7689A6C; Sat, 11 Mar 2017 19:54:51 +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.15.19]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 75F2C6891DD for ; Sat, 11 Mar 2017 19:54:45 +0200 (EET) Received: from akuma.local ([134.109.251.187]) by mail.gmx.com (mrgmx002 [212.227.17.190]) with ESMTPSA (Nemesis) id 0MUZG7-1ceoz2359v-00RI9c for ; Sat, 11 Mar 2017 18:54:59 +0100 Date: Sat, 11 Mar 2017 18:54:58 +0100 From: Alexander Strasser To: ffmpeg-devel@ffmpeg.org Message-ID: 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:iQJGFA41mTPmJibV7No41cc54ZlVaiWYg1VPF4TvdkifRnv7yAX aL6lvB1+kCi8nmP+WdfJbSPPQj3qupmGlNXbA68P9RUp2rUHQqDExFkh7RS3kSb6dLuoZLD KCEF+4N9Cj3epLD3iidTmvhjN7Y4Fali/5eFGDVtIokv12g5m5b4CKC+tboL3EiYH+yq74j Vn0a/59pn2NQrROmXkwSg== X-UI-Out-Filterresults: notjunk:1; V01:K0:/hShucDlW8c=:dEJTpwkK7QkFKEn7WYmK9K lq/ng48YOjGaI2op6zfMQB+gYdpkfS7MctmpuM92UkBW/qLHY7iStc/OpkueiV8FWY0k0Nh0g urrlFSSbMSthiDNPTlF8e803OetyZl5ZcVjOBRMezZqaOAs5rZkbmdrMEDyQLhYzA/kinCvF1 sHUWMG0+s9XmPuuQJed7pETnH75qPTb7djLqacmxueLBSNMI32ExOYz5JlRCOPG3OvidB8c6a bd0AW79t7Emka152TTHgtEA+CRlPZXWrwyDHwbgfYCKFxzPK3EUdZQOBGvLN3H3cuCmN1Uwl7 b0qbXPMJYYgLYaJV1ySq0+U3Ii+uCmqLHhojkcWWTVrpVd4jSkufG7jRqcIP7PDar0VfOhG35 9jBS+lGqp2V/+/VtMs0ti/tsJQkONCvJzL2EK1yCKTh519VqmPlQ5n5ZFolJKlO3n3VtNl1XX JyYNpeyVGHFmO/Rgh3zjKuX0raHrcvQyiHLS4LHD2scQ+qio8DIJhHi4eSSlBnN6h4w7TuRHQ qrGQaX5+9y0lBpQC0rjfIk8EgqeNxgA6r0v6oidHqAOvV086keGQnq+8tEnWHLCf8f3UFYr6Z GiGOACRWvVIV0rjsVzkp31aYFLLttHQ0ERoV891I/xY+lILC0EEbTiBHvlyezWH7UeoYxBl3r cnQoF7tH2E1DDPFMTyjaPBuuG4Qfn7mQpnkn0LDs9uad4cz5YxeljrhaM1GvnBN+f91aIcgRP F9pISmxFgPyDIfMcp9WKw5MEon061dMlmNwbbNcOU5pR+UNwHSXQuXzd8CI= Subject: [FFmpeg-devel] [PATCH 1/2] lavf: Remove unnecessary escaping of ' in string literals 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" 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 62233a6..9020aa9 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 not on whitelist '%s'!\n", 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 blacklisted '%s'!\n", uc->protocol_blacklist); return AVERROR(EINVAL); } diff --git a/libavformat/utils.c b/libavformat/utils.c index 37d7024..9c8287f 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 not on whitelist '%s'\n", 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 not on whitelist '%s'\n", s->format_whitelist); ret = AVERROR(EINVAL); goto fail; }