From 261243496ef7a7e90c921f868411ddf8c71c1d83 Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 30 Jul 2012 21:13:03 +0200 Subject: configure: remove memalign check Also, replace the only use of memalign: use av_malloc instead in sub.c. (av_malloc allocates with the required alignment restrictions.) --- sub/sub.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'sub') diff --git a/sub/sub.c b/sub/sub.c index 485550a470..21c8d03c67 100644 --- a/sub/sub.c +++ b/sub/sub.c @@ -20,6 +20,9 @@ #include #include +#include +#include + #include "config.h" #if HAVE_MALLOC_H #include @@ -38,7 +41,6 @@ #include "libvo/video_out.h" #include "sub.h" #include "spudec.h" -#include "libavutil/common.h" char * const sub_osd_names[]={ @@ -140,8 +142,8 @@ void osd_alloc_buf(mp_osd_obj_t* obj) obj->allocated = len; free(obj->bitmap_buffer); free(obj->alpha_buffer); - obj->bitmap_buffer = memalign(16, len); - obj->alpha_buffer = memalign(16, len); + obj->bitmap_buffer = av_malloc(len); + obj->alpha_buffer = av_malloc(len); } memset(obj->bitmap_buffer, sub_bg_color, len); memset(obj->alpha_buffer, sub_bg_alpha, len); -- cgit v1.2.3