[Mplayer-cvslog] CVS: main/libvo vo_vesa.c,1.40,1.41
pl
pl at mplayer.dev.hu
Fri Nov 9 03:03:00 CET 2001
Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv23795/libvo
Modified Files:
vo_vesa.c
Log Message:
memalign detection cleanup
Index: vo_vesa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_vesa.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- vo_vesa.c 6 Nov 2001 11:21:08 -0000 1.40
+++ vo_vesa.c 9 Nov 2001 02:02:58 -0000 1.41
@@ -25,7 +25,7 @@
#include "video_out.h"
#include "video_out_internal.h"
-#ifdef HAVE_MEMALIGN
+#ifdef HAVE_MALLOC_H
#include <malloc.h>
#endif
@@ -791,11 +791,7 @@
cpy_blk_fnc = __vbeCopyBlock;
if(yuv_fmt || rgb2rgb_fnc)
{
-#ifdef HAVE_MEMALIGN
if(!(dga_buffer = memalign(64,video_mode_info.XResolution*video_mode_info.YResolution*video_mode_info.BitsPerPixel)))
-#else
- if(!(dga_buffer = malloc(video_mode_info.XResolution*video_mode_info.YResolution*video_mode_info.BitsPerPixel)))
-#endif
{
printf("vo_vesa: Can't allocate temporary buffer\n");
return -1;
More information about the MPlayer-cvslog
mailing list