generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmdutils: fix expected signature for show_colors() function

Browse Source 
Fix warning:
In file included from ffprobe.c:2557:0:
cmdutils_common_opts.h:17:5: warning: initialization from incompatible pointer type [enabled by default]
cmdutils_common_opts.h:17:5: warning: (near initialization for ‘real_options[16].u.func_arg’) [enabled by default]

Spotted-by: Paul B Mahol
This commit is contained in:
Stefano Sabatini 2013-10-28 09:39:38 +01:00
parent 0fef19b15a
commit 6baf9c4406
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmdutils.c
View File

@ -1518,7 +1518,7 @@ int show_filters(void *optctx, const char *opt, const char *arg)
return 0; return 0;
} }
void show_colors(void *optctx, const char *opt, const char *arg) int show_colors(void *optctx, const char *opt, const char *arg)
{ {
const char *name; const char *name;
const uint8_t *rgb; const uint8_t *rgb;
@ -1528,6 +1528,8 @@ void show_colors(void *optctx, const char *opt, const char *arg)
for (i = 0; name = av_get_known_color_name(i, &rgb); i++) for (i = 0; name = av_get_known_color_name(i, &rgb); i++)
printf("%-32s #%02x%02x%02x\n", name, rgb[0], rgb[1], rgb[2]); printf("%-32s #%02x%02x%02x\n", name, rgb[0], rgb[1], rgb[2]);
return 0;
} }
int show_pix_fmts(void *optctx, const char *opt, const char *arg) int show_pix_fmts(void *optctx, const char *opt, const char *arg)

2
cmdutils.h
View File

@ -492,7 +492,7 @@ int show_sample_fmts(void *optctx, const char *opt, const char *arg);
* Print a listing containing all the color names and values recognized * Print a listing containing all the color names and values recognized
* by the program. * by the program.
*/ */
void show_colors(void *optctx, const char *opt, const char *arg); int show_colors(void *optctx, const char *opt, const char *arg);
/** /**
* Return a positive value if a line read from standard input * Return a positive value if a line read from standard input