From patchwork Mon Dec 4 05:02:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 6537 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp3975931jah; Sun, 3 Dec 2017 21:02:37 -0800 (PST) X-Google-Smtp-Source: AGs4zMbMzaDCzDqxsZcdFcPfOp04yKcypADnhvkTH7jzfCmLtrhpbU29TRQQSfugHX1E/h+l7Ui8 X-Received: by 10.28.0.6 with SMTP id 6mr6122019wma.109.1512363757673; Sun, 03 Dec 2017 21:02:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512363757; cv=none; d=google.com; s=arc-20160816; b=q2kHnYwVYHTJQmSLyw3sKiLeRsLbULNWjInVyWb4eOJko8fwKCKu3DEkiqNGxpZ1l3 WhOcDteeH6NVmf8KpoBg2ii7XxjgICBixpZ3Vjr+mGSMx43pgq/UoVmxMPdpbjXV7DJN xLPAy87ycQFX4nuvsgIrZQywlaG3hX8PivZUDGHcKz74YeVIfTIFmsIXZOdesDHvKD20 bjbBftSs3BFNWkgHfdxl3d6lX8HJYqwiv0U5NqJ49Wyi35tQEHRSb/WUAyuUfTk2HFrs nQa9gJ0Vb3qBkem2rM+4eNB8ZTXlzysgRz60JNCvkBaj111YReNSxjhsgTx6rcHetL0N pOJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=jpDqYlUHYIRzrcCZW1H65KdLSLyRY9j7FPYHt9ykHAI=; b=xZlTLVdy5vK61Y661qlVhZr0J4/jeOxl0f67GLEdLTUu5WiWscvH7U/vCWj9W1jDFh eS/Xz1sS5kNbomi2YgGFACZN8iB3fMd5yYn+9znoq64QlyrAtGjKjPKnMat1Wg4W7A91 B1HLsXhO4GSDwUVpIsGgFjw+u7VzS8rbzFtWJ7LHSAFKu2tSpuKS3C4FLcz2B5DjFxGH UIbKgXnzexp88XTbPvnKQ7jy2J6KjXG59EnUTKY3jeKMmR8/RQ0Imn66YXaHWrI2+25C tbuF4kFvUSSFTvKYoMwqqn3Ot6X6DJUMGcD7sR/fJ+CYVPvBaHa2G5k3AYWoBmQaodiV DQEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=W431MhBJ; 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=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n2si4363489wmc.106.2017.12.03.21.02.36; Sun, 03 Dec 2017 21:02:37 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=W431MhBJ; 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=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 658F168A24C; Mon, 4 Dec 2017 07:02:30 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f176.google.com (mail-pf0-f176.google.com [209.85.192.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73AC468A0D1 for ; Mon, 4 Dec 2017 07:02:23 +0200 (EET) Received: by mail-pf0-f176.google.com with SMTP id l24so7687878pfj.6 for ; Sun, 03 Dec 2017 21:02:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=Ua4h3XzG91WeP6s9LPI+LorsSIN85asRIZHsoW35uX0=; b=W431MhBJndu/Xml4DDTarEtzmJtZ9Z1lByenTJWnK23uLkBWmHvdvvq5SGgahyMIXw ZDY1adDH7Oif2N4a4oVRFoMyWrfzwVDDIYh2jMoUAxlpZcTDie9KM/f3EvCnmpiPhqYt i2kheUVaQOmFH9ZSgDX7lWz9fR6L43e8tMVS+jlL+/RfenoPladhazs67AATcbFrxrij 1NTl5hsSLnctJnam4ujSaWwftATSFLZp7bIid99yKSFMeq4snGPP32cOg1SXxPpamh5B 4mbRKHYezv0319kMowus1yf+U8hcP3ikkeHre+cyzlqzGFtsPClYq5fzl6tGKNR+tI/7 +k0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=Ua4h3XzG91WeP6s9LPI+LorsSIN85asRIZHsoW35uX0=; b=MhVkLzUA08L4ofFKFrMoeEwhUOInheO5l2KQGMIsWkOcJi6juur5od8y/qZwS2f/Z/ 01egahu6bf61LWLHdcljwpIdsQ1kBxPQ2qSmA28GvHfmS8gDnIudS+Bp5vjG5PdLX3qH DV8efFhpckvLRsurAO7wvUyqfPfn97rA9yIRbxEMXbDvzU5MDtDyF9Yc628Qr+IQKbMC e8BJVBX/L0JzE5F7plLPUubIHQRk419XPxkj5v6DSLXdlLMItNcEZYGUWo4IWWoYBQIG 7DGAcFVHCbpi/4Me11rHnuPbBVC9ebadRQSv62OHmB0Qmr0zTbxLbFRvuzzcAypw18u6 9k5A== X-Gm-Message-State: AJaThX7jypH6R0Otao7PMV42V9ZsP6iSxBxw77/6utQ1x5kFa03a9QZJ qo+kyUq5mOtVNNtfWsdvByk= X-Received: by 10.101.86.197 with SMTP id w5mr12865172pgs.190.1512363746360; Sun, 03 Dec 2017 21:02:26 -0800 (PST) Received: from [10.67.68.55] ([192.55.54.44]) by smtp.gmail.com with ESMTPSA id q68sm11258833pfb.1.2017.12.03.21.02.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Dec 2017 21:02:25 -0800 (PST) To: FFmpeg development discussions and patches , Michael Niedermayer From: Jun Zhao Message-ID: Date: Mon, 4 Dec 2017 13:02:20 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH] avfilter/formats: fix wrong function name in error message 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" From 336be81bef86244a28b378b4c143ad8924c9e2d9 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Mon, 4 Dec 2017 12:50:34 +0800 Subject: [PATCH] avfilter/formats: fix wrong function name in error message Use perdefined micro __FUNCTION__ rather than hard coding function name to fix wrong function name in error message. Signed-off-by: Jun Zhao --- libavfilter/formats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/formats.c b/libavfilter/formats.c index d4de862237..20a2c89719 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -72,7 +72,7 @@ do { for (j = 0; j < b->nb; j++) \ if (a->fmts[i] == b->fmts[j]) { \ if(k >= FFMIN(a->nb, b->nb)){ \ - av_log(NULL, AV_LOG_ERROR, "Duplicate formats in avfilter_merge_formats() detected\n"); \ + av_log(NULL, AV_LOG_ERROR, "Duplicate formats in %s detected\n", __FUNCTION__); \ av_free(ret->fmts); \ av_free(ret); \ return NULL; \