From dc46b3c34e0651215a9357bcc0aba04e2bad9721 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Fri, 14 Feb 2020 12:24:03 +0100 Subject: [PATCH] avcodec/dvdsub: Fix warning about incompatible pointer type MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Paul B Mahol Signed-off-by: James Almer --- 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++; }