mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 12:02:23 +02:00
compiler warning fixes by Dominik
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7849 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
3dad4315a4
commit
4a3d6d4205
@ -1,5 +1,6 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include "../config.h"
|
||||
#include "audio_out.h"
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user