From patchwork Mon Jan 13 13:44:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 17322 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 2F45C449B9A for ; Mon, 13 Jan 2020 16:06:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D57068ADAA; Mon, 13 Jan 2020 16:06:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7592468AAA5 for ; Mon, 13 Jan 2020 16:06:41 +0200 (EET) Received: by mail-pl1-f196.google.com with SMTP id bd4so3865955plb.8 for ; Mon, 13 Jan 2020 06:06:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=xO+6MqkVoTUUHJjLvE+7d6DXGtR3y5wmdDg1zZ+Y6MM=; b=sN9PF3Gt+/rnzph36CB0g1Ag/B9koCs6c0OD68MOcVczgyrxmkvMK+w7sRcKBXTvYu fBhA6AAEle5hyaQWaHLnej5l33OWZ34VZcudu1qYvZ7/ZF8ZrUyUEdSAj0hZKO/5xY2I 8sGnMXpVjO+InqmS+i5TmUyLA9NOEDoeKvHH7TtU0KFp41/PxnRfA+TgT8rYYfwE3RFC v8h+xu0OhF4GexWaSf+gxH4r4wZUu8ID65IIs/+dV9+03TpoCKGVxuHtHmsoj7Xx6JTA Z6/riKJaK6N/EhK+wQ98dkloovLH27o0JImA+vJt8pu+eHDRtfj7ikNerhhOq/UfY8LX Z1Gw== 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; bh=xO+6MqkVoTUUHJjLvE+7d6DXGtR3y5wmdDg1zZ+Y6MM=; b=GngmeVLHfbXvpl57Xt1u3g4Sdz8jc8V8vdBYn3Ycj6xOay0mcgOhY6P9EFGUOFj9ji 2VhRd7bzWc+4Cm3eAdwz1/6XQMRH3ZOyK5j0Pv4PFX5kn5h+hBEZJdFalpRANiUthZun 8dyYNeY5mypu9jddB3/ZHk6vGgZPDgTZ4AHmJp5bPJpguUwgK70ZhxyKlNso3XB00ARi khlpWp2DHXIq3OognMrhzRkXTf6oWAQq7DxGpR5N9Df5oKjijzo0bZkprMybyH9gf7/p cVtlkBMVhOTKLiWsyxyyjtOQieZEL9AKPK+MbbN3lgO17EY272ODrhc7qdyOPWClTrwC uKxQ== X-Gm-Message-State: APjAAAXn+8lDOPGCmeQSSYMzy4ZqJfBi8wW2zgYe71W+VAZbZ+gOYqfa 1kCFkFP7rUR6wT5YGdkv0o89Ve3i X-Google-Smtp-Source: APXvYqw4/U2o6WzrJ/HQje4K5iG61zmj08r4YhDBR29uJjScdSpfn6WaNHnsB8Mhz9p3d/er56IHaw== X-Received: by 2002:a17:90a:e98d:: with SMTP id v13mr22899979pjy.89.1578923096769; Mon, 13 Jan 2020 05:44:56 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id 13sm14413773pfi.78.2020.01.13.05.44.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jan 2020 05:44:56 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Jan 2020 21:44:49 +0800 Message-Id: <20200113134451.9511-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 Subject: [FFmpeg-devel] [PATCH v1 1/3] avutil/avstring: Fix warning: ISO C90 forbids mixed declarations and code 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavutil/avstring.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavutil/avstring.c b/libavutil/avstring.c index 76a13ba..f4b8ed2 100644 --- a/libavutil/avstring.c +++ b/libavutil/avstring.c @@ -258,15 +258,17 @@ char *av_strireplace(const char *str, const char *from, const char *to) const char *av_basename(const char *path) { char *p; +#if HAVE_DOS_PATHS + char *q, *d; +#endif if (!path || *path == '\0') return "."; p = strrchr(path, '/'); #if HAVE_DOS_PATHS - char *q = strrchr(path, '\\'); - char *d = strchr(path, ':'); - + q = strrchr(path, '\\'); + d = strchr(path, ':'); p = FFMAX3(p, q, d); #endif