summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-10-22 16:24:26 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-10-22 16:24:26 +0000
commit4a3d6d4205035f681ef972afaf7ba8864937e570 (patch)
tree045898ae3f6b6cf3939194d8b060e05ddaa7dd0b
parent3dad4315a4ac8439401dc179624ab7794f12d542 (diff)
downloadmpv-4a3d6d4205035f681ef972afaf7ba8864937e570.tar.bz2
mpv-4a3d6d4205035f681ef972afaf7ba8864937e570.tar.xz
compiler warning fixes by Dominik
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7849 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libao2/audio_out.c1
-rw-r--r--libmpcodecs/vf_1bpp.c2
-rw-r--r--libvo/vo_xv.c4
3 files changed, 4 insertions, 3 deletions
diff --git a/libao2/audio_out.c b/libao2/audio_out.c
index 03097b9d5a..34efbe98ba 100644
--- a/libao2/audio_out.c
+++ b/libao2/audio_out.c
@@ -1,5 +1,6 @@
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include "../config.h"
#include "audio_out.h"
diff --git a/libmpcodecs/vf_1bpp.c b/libmpcodecs/vf_1bpp.c
index 528bac0fbc..b5bbd32889 100644
--- a/libmpcodecs/vf_1bpp.c
+++ b/libmpcodecs/vf_1bpp.c
@@ -148,7 +148,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi){
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);
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 32601233cb..ae27c7097f 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -466,7 +466,7 @@ static void allocate_xvimage(int foo)
}
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 @@ static void allocate_xvimage(int foo)
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);
}