Mercurial > mplayer.hg
changeset 14850:ba555409718b
Fix compile warnings
| author | ivo |
|---|---|
| date | Mon, 28 Feb 2005 00:26:53 +0000 |
| parents | d313f591d1a4 |
| children | c0678c89b278 |
| files | libvo/vo_jpeg.c libvo/vo_md5sum.c libvo/vo_pnm.c |
| diffstat | 3 files changed, 24 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/vo_jpeg.c Sun Feb 27 23:06:32 2005 +0000 +++ b/libvo/vo_jpeg.c Mon Feb 28 00:26:53 2005 +0000 @@ -219,7 +219,7 @@ static uint32_t draw_frame(uint8_t *src[]) { - static uint32_t framecounter = 0, subdircounter = 0; + static int framecounter = 0, subdircounter = 0; char buf[BUFLENGTH]; static char subdirname[BUFLENGTH] = ""; @@ -316,18 +316,18 @@ static uint32_t preinit(const char *arg) { opt_t subopts[] = { - {"progressive", OPT_ARG_BOOL, &jpeg_progressive_mode, NULL}, - {"baseline", OPT_ARG_BOOL, &jpeg_baseline, NULL}, + {"progressive", OPT_ARG_BOOL, &jpeg_progressive_mode, NULL, 0}, + {"baseline", OPT_ARG_BOOL, &jpeg_baseline, NULL, 0}, {"optimize", OPT_ARG_INT, &jpeg_optimize, - (opt_test_f)int_zero_hundred}, + (opt_test_f)int_zero_hundred, 0}, {"smooth", OPT_ARG_INT, &jpeg_smooth, - (opt_test_f)int_zero_hundred}, + (opt_test_f)int_zero_hundred, 0}, {"quality", OPT_ARG_INT, &jpeg_quality, - (opt_test_f)int_zero_hundred}, - {"outdir", OPT_ARG_MSTRZ, &jpeg_outdir, NULL}, - {"subdirs", OPT_ARG_MSTRZ, &jpeg_subdirs, NULL}, - {"maxfiles", OPT_ARG_INT, &jpeg_maxfiles, (opt_test_f)int_pos}, - {NULL} + (opt_test_f)int_zero_hundred, 0}, + {"outdir", OPT_ARG_MSTRZ, &jpeg_outdir, NULL, 0}, + {"subdirs", OPT_ARG_MSTRZ, &jpeg_subdirs, NULL, 0}, + {"maxfiles", OPT_ARG_INT, &jpeg_maxfiles, (opt_test_f)int_pos, 0}, + {NULL, 0, NULL, NULL, 0} }; const char *info_message = NULL;
--- a/libvo/vo_md5sum.c Sun Feb 27 23:06:32 2005 +0000 +++ b/libvo/vo_md5sum.c Mon Feb 28 00:26:53 2005 +0000 @@ -104,12 +104,10 @@ static uint32_t preinit(const char *arg) { opt_t subopts[] = { - {"outfile", OPT_ARG_MSTRZ, &md5sum_outfile, NULL}, - {NULL} + {"outfile", OPT_ARG_MSTRZ, &md5sum_outfile, NULL, 0}, + {NULL, 0, NULL, NULL, 0} }; - char *buf; /* buf is used to store parsed string values */ - mp_msg(MSGT_VO, MSGL_INFO, "%s: %s\n", info.short_name, MSGTR_VO_ParsingSuboptions); @@ -204,7 +202,7 @@ uint32_t strideV = mpi->stride[2]; auth_md5Ctx md5_context; - int i; + unsigned int i; if (mpi->flags & MP_IMGFLAG_PLANAR) { /* Planar */ if (mpi->flags & MP_IMGFLAG_YUV) { /* Planar YUV */
--- a/libvo/vo_pnm.c Sun Feb 27 23:06:32 2005 +0000 +++ b/libvo/vo_pnm.c Mon Feb 28 00:26:53 2005 +0000 @@ -121,15 +121,15 @@ int ppm_type = 0, pgm_type = 0, pgmyuv_type = 0, raw_mode = 0, ascii_mode = 0; opt_t subopts[] = { - {"ppm", OPT_ARG_BOOL, &ppm_type, NULL}, - {"pgm", OPT_ARG_BOOL, &pgm_type, NULL}, - {"pgmyuv", OPT_ARG_BOOL, &pgmyuv_type, NULL}, - {"raw", OPT_ARG_BOOL, &raw_mode, NULL}, - {"ascii", OPT_ARG_BOOL, &ascii_mode, NULL}, - {"outdir", OPT_ARG_MSTRZ, &pnm_outdir, NULL}, - {"subdirs", OPT_ARG_MSTRZ, &pnm_subdirs, NULL}, - {"maxfiles", OPT_ARG_INT, &pnm_maxfiles, (opt_test_f)int_pos}, - {NULL} + {"ppm", OPT_ARG_BOOL, &ppm_type, NULL, 0}, + {"pgm", OPT_ARG_BOOL, &pgm_type, NULL, 0}, + {"pgmyuv", OPT_ARG_BOOL, &pgmyuv_type, NULL, 0}, + {"raw", OPT_ARG_BOOL, &raw_mode, NULL, 0}, + {"ascii", OPT_ARG_BOOL, &ascii_mode, NULL, 0}, + {"outdir", OPT_ARG_MSTRZ, &pnm_outdir, NULL, 0}, + {"subdirs", OPT_ARG_MSTRZ, &pnm_subdirs, NULL, 0}, + {"maxfiles", OPT_ARG_INT, &pnm_maxfiles, (opt_test_f)int_pos, 0}, + {NULL, 0, NULL, NULL, 0} }; const char *info_message = NULL; @@ -309,7 +309,7 @@ uint32_t strideU = mpi->stride[1]; uint32_t strideV = mpi->stride[2]; - int i, j; + unsigned int i, j; if (pnm_mode == PNM_RAW_MODE) { @@ -433,7 +433,7 @@ void pnm_write_image(mp_image_t *mpi) { - static uint32_t framenum = 0, framecounter = 0, subdircounter = 0; + static int framenum = 0, framecounter = 0, subdircounter = 0; char buf[BUFLENGTH]; static char subdirname[BUFLENGTH] = ""; FILE *outfile;