summaryrefslogtreecommitdiffstats
path: root/sub
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-07-30 21:13:03 +0200
committerwm4 <wm4@nowhere>2012-07-30 22:14:33 +0200
commit261243496ef7a7e90c921f868411ddf8c71c1d83 (patch)
tree9f2e156fb47b7c2fd47b603a12a7ef79c3ad423e /sub
parent7cdfd2ba39cd1a69139d9a2c3788aa8865e37e7d (diff)
downloadmpv-261243496ef7a7e90c921f868411ddf8c71c1d83.tar.bz2
mpv-261243496ef7a7e90c921f868411ddf8c71c1d83.tar.xz
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.)
Diffstat (limited to 'sub')
-rw-r--r--sub/sub.c8
1 files changed, 5 insertions, 3 deletions
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 <stdlib.h>
#include <string.h>
+#include <libavutil/mem.h>
+#include <libavutil/common.h>
+
#include "config.h"
#if HAVE_MALLOC_H
#include <malloc.h>
@@ -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);