From patchwork Fri Feb 14 11:24:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 17785 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 7CE4144A08F for ; Fri, 14 Feb 2020 13:45:59 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C87268AF71; Fri, 14 Feb 2020 13:45:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f193.google.com (mail-lj1-f193.google.com [209.85.208.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBE59689DAF for ; Fri, 14 Feb 2020 13:45:52 +0200 (EET) Received: by mail-lj1-f193.google.com with SMTP id x7so10400968ljc.1 for ; Fri, 14 Feb 2020 03:45:52 -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:mime-version :content-transfer-encoding; bh=jiqAE0TzqVzPQZqpaYU8M74k8RAy6ply7Q8tGw/bXo4=; b=eHKz8vaQ7rlzcPU66MXM31Ij/Rk5pl5oesfOw18iW2x3lh1MMH0jQ26DEYE7tZ6DVD WGZorsyz9t197Fz2u7wyF+U8sJeLi9r2C64UoXvLMbko8s7qPlpg5hBCRq0eApfWpxDj /BuIEeODrH1zOjTuqMsrHnsMVRxMmzLISJUzOUWbWEqpgU8p2j+NhRbbPLNemkLk/r+z R0yMUiiK2fiYWECsDuhdoQaTTVG7YrLY/HqbJBRYJVd4ElmNy8ekd2K8+6dD8hAUbN+E klng4zw8UP4k9w5XbOF5SO3jy6aKu6zqnu8k8Nh7zYDTaPwEmlhlyL8hejj9CSLWiAaX hpow== 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:mime-version :content-transfer-encoding; bh=jiqAE0TzqVzPQZqpaYU8M74k8RAy6ply7Q8tGw/bXo4=; b=JeymnEKfdKFpXIgLXQDvVwUk+Za3LxZMQMdnGicDDf3QeRUxCWyxSJFKB5V1HOORNS nF2mGMdv6GHZOn+GuJH4js4O9LElHlQg17igD8CcdZS7jRWfs7oDbR5+MIQ8uk+Zf/ad pTuHFip7yxax4aBAp+Um1qGptBZpQYvGvYTYQWpNHBpqUrApbgfwIEHDovuqFeJD6wZv tWC/0sfZ1JvR7N7Bk5pBRzucugOwODQtdBN9ag6foTv0C/txwUJjoGRtcb1Fq1l/BfB4 i2asM6uejxzIqq+FVsqKcKC2gX+iX3+EI9iXP4DQcyJSpBTUe07EiSk10RQhLYj2j35f 2rSw== X-Gm-Message-State: APjAAAUYmMQQGKMXfjWoHW26eHj3GOEdMkuNCbRv7vakADNPBbr4ve3w WANSwniQpQ8h+dNlq9fLOrV4+Wdn X-Google-Smtp-Source: APXvYqxk1gE87Pkm8PKPJIpoveJlv/2FKJqZdawZOH0M5QeJ7J9ofUu9B2/QFXEY1wl1a4u4+uU8yw== X-Received: by 2002:adf:dd46:: with SMTP id u6mr3467335wrm.13.1581679451046; Fri, 14 Feb 2020 03:24:11 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1ab4b.dynamic.kabel-deutschland.de. [188.193.171.75]) by smtp.gmail.com with ESMTPSA id n13sm7129704wmd.21.2020.02.14.03.24.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Feb 2020 03:24:10 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Feb 2020 12:24:03 +0100 Message-Id: <20200214112403.18370-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/dvdsub: Fix warning about incompatible pointer type 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes "passing argument 2 of ‘strtoul’ from incompatible pointer type [-Wincompatible-pointer-types]" ("expected ‘char ** restrict’ but argument is of type ‘const char **’") for GCC and "passing 'const char **' to parameter of type 'char **' discards qualifiers in nested pointer types [-Wincompatible-pointer-types-discards-qualifiers]" for Clang. The cast itself is safe; it is only needed because strtoul itself is not const-correct. Signed-off-by: Andreas Rheinhardt --- libavcodec/dvdsub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dvdsub.c b/libavcodec/dvdsub.c index a03ff27754..87215d2bd1 100644 --- a/libavcodec/dvdsub.c +++ b/libavcodec/dvdsub.c @@ -26,7 +26,7 @@ void ff_dvdsub_parse_palette(uint32_t *palette, const char *p) { for (int i = 0; i < 16; i++) { - palette[i] = strtoul(p, &p, 16); + palette[i] = strtoul(p, (char **)&p, 16); while (*p == ',' || av_isspace(*p)) p++; }