RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/dvdsub: Fix warning about incompatible pointer type 

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 <andreas.rheinhardt@gmail.com>
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-02-14 12:24:03 +01:00 committed by James Almer
parent 5fe6c6b8f4
commit dc46b3c34e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/dvdsub.c
View File

@ -26,7 +26,7 @@
void ff_dvdsub_parse_palette(uint32_t *palette, const char *p) void ff_dvdsub_parse_palette(uint32_t *palette, const char *p)
{ {
for (int i = 0; i < 16; i++) { 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)) while (*p == ',' || av_isspace(*p))
p++; p++;
} }