Fix compile warnings

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14851 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
ivo 2005-02-28 00:26:53 +00:00
parent 95cf851ea6
commit 359bdf3bed
3 changed files with 24 additions and 26 deletions

View File

@ -219,7 +219,7 @@ static uint32_t jpeg_write(uint8_t * name, uint8_t * buffer)
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 int int_zero_hundred(int *val)
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;

View File

@ -104,12 +104,10 @@ void md5sum_write_error(void) {
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 @@ static uint32_t draw_image(mp_image_t *mpi)
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 */

View File

@ -121,15 +121,15 @@ static uint32_t preinit(const char *arg)
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 @@ void pnm_write_pnm(FILE *outfile, mp_image_t *mpi)
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_pnm(FILE *outfile, mp_image_t *mpi)
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;