diff options
Diffstat (limited to 'libvo/vo_aa.c')
| -rw-r--r-- | libvo/vo_aa.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/libvo/vo_aa.c b/libvo/vo_aa.c index 48b9f2f2ad..140c251355 100644 --- a/libvo/vo_aa.c +++ b/libvo/vo_aa.c @@ -68,8 +68,8 @@ aa_context *c; aa_renderparams *p; static int fast =0; /* used for the sws */ -static uint8_t * image[3]; -static int image_stride[3]; +static uint8_t * image[MP_MAX_PLANES]; +static int image_stride[MP_MAX_PLANES]; /* image infos */ static int image_format; @@ -125,13 +125,11 @@ resize(void){ sws = sws_getContextFromCmdLine(src_width,src_height,image_format, image_width,image_height,IMGFMT_Y8); + memset(image, 0, sizeof(image)); image[0] = aa_image(c) + image_y * aa_imgwidth(c) + image_x; - image[1] = NULL; - image[2] = NULL; + memset(image_stride, 0, sizeof(image_stride)); image_stride[0] = aa_imgwidth(c); - image_stride[1] = 0; - image_stride[2] = 0; showosdmessage=0; @@ -336,7 +334,7 @@ query_format(uint32_t format) { static int draw_frame(uint8_t *src[]) { - int stride[3] = { 0 , 0 , 0 }; + int stride[MP_MAX_PLANES] = {0}; switch(image_format) { case IMGFMT_BGR15: @@ -576,9 +574,9 @@ static int parse_suboptions(const char *arg) { *helpmsg = NULL; int pseudoargc, displayhelp = 0, *booleans; const opt_t extra_opts[] = { - {"osdcolor", OPT_ARG_MSTRZ, &osdcolor, NULL, 0}, - {"subcolor", OPT_ARG_MSTRZ, &subcolor, NULL, 0}, - {"help", OPT_ARG_BOOL, &displayhelp, NULL, 0} }; + {"osdcolor", OPT_ARG_MSTRZ, &osdcolor, NULL}, + {"subcolor", OPT_ARG_MSTRZ, &subcolor, NULL}, + {"help", OPT_ARG_BOOL, &displayhelp, NULL} }; opt_t *subopts = NULL, *p; char * const strings_list[] = {"-driver", "-kbddriver", "-mousedriver", "-font", "-width", "-height", "-minwidth", "-minheight", "-maxwidth", |