diff options
| author | pl <pl@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-09 02:02:58 +0000 |
|---|---|---|
| committer | pl <pl@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-09 02:02:58 +0000 |
| commit | 2b1aa3af8629892d1e82808419101b5d64422e33 (patch) | |
| tree | 71f9d4304953ecb610b5314b7b63338a4a252aba /libvo | |
| parent | 50d8ca519b20dc8313ad4b9240d413442222b429 (diff) | |
| download | mpv-2b1aa3af8629892d1e82808419101b5d64422e33.tar.bz2 mpv-2b1aa3af8629892d1e82808419101b5d64422e33.tar.xz | |
memalign detection cleanup
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2775 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_vesa.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index 3eade479ed..60904daef7 100644 --- a/libvo/vo_vesa.c +++ b/libvo/vo_vesa.c @@ -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 @@ init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint3 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; |