Mercurial > mplayer.hg
changeset 7848:3c1d30a1afc0
compiler warning fixes by Dominik
| author | arpi |
|---|---|
| date | Tue, 22 Oct 2002 16:24:26 +0000 |
| parents | f1e6a68a42f1 |
| children | 7ccdc4870ca6 |
| files | libao2/audio_out.c libmpcodecs/vf_1bpp.c libvo/vo_xv.c |
| diffstat | 3 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/libao2/audio_out.c Tue Oct 22 16:02:21 2002 +0000 +++ b/libao2/audio_out.c Tue Oct 22 16:24:26 2002 +0000 @@ -1,5 +1,6 @@ #include <stdio.h> #include <stdlib.h> +#include <string.h> #include "../config.h" #include "audio_out.h"
--- a/libmpcodecs/vf_1bpp.c Tue Oct 22 16:02:21 2002 +0000 +++ b/libmpcodecs/vf_1bpp.c Tue Oct 22 16:24:26 2002 +0000 @@ -148,7 +148,7 @@ break; default: mp_msg(MSGT_VFILTER,MSGL_ERR,"Unhandled format: 0x%X\n",dmpi->imgfmt); - return NULL; + return 0; } return vf_next_put_image(vf,dmpi);
--- a/libvo/vo_xv.c Tue Oct 22 16:02:21 2002 +0000 +++ b/libvo/vo_xv.c Tue Oct 22 16:24:26 2002 +0000 @@ -466,7 +466,7 @@ } if ( Shmem_Flag ) { - xvimage[foo] = XvShmCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height, &Shminfo[foo]); + xvimage[foo] = (XvImage *) XvShmCreateImage(mDisplay, xv_port, xv_format, NULL, image_width, image_height, &Shminfo[foo]); Shminfo[foo].shmid = shmget(IPC_PRIVATE, xvimage[foo]->data_size, IPC_CREAT | 0777); Shminfo[foo].shmaddr = (char *) shmat(Shminfo[foo].shmid, 0, 0); @@ -480,7 +480,7 @@ else #endif { - xvimage[foo] = XvCreateImage(mDisplay, xv_port, xv_format, 0, image_width, image_height); + xvimage[foo] = (XvImage *) XvCreateImage(mDisplay, xv_port, xv_format, NULL, image_width, image_height); xvimage[foo]->data = malloc(xvimage[foo]->data_size); XSync(mDisplay,False); }