From a353f11132a6716296be1a31b6ada28b8122f914 Mon Sep 17 00:00:00 2001
From: michael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 30 Jan 2011 22:57:16 +0000
Subject: libmpcodecs/vf_*.c: Replace memalign() by av_malloc()

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32834 b3059339-0415-0410-9bf9-f77b7e298cf2

Fix postprocessing and perspective filters on x86-64
(missing libavutil/mem.h include).

Original patch by Reinhard Tartler

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32835 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 libmpcodecs/vf_perspective.c | 6 ++++--
 libmpcodecs/vf_pp7.c         | 6 ++++--
 libmpcodecs/vf_sab.c         | 8 ++++----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/libmpcodecs/vf_perspective.c b/libmpcodecs/vf_perspective.c
index 8c6caca059..b835e6b1cb 100644
--- a/libmpcodecs/vf_perspective.c
+++ b/libmpcodecs/vf_perspective.c
@@ -32,6 +32,8 @@
 #include <malloc.h>
 #endif
 
+#include "libavutil/mem.h"
+
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
@@ -108,7 +110,7 @@ static int config(struct vf_instance *vf,
 	int i, j;
 
 	vf->priv->pvStride= width;
-	vf->priv->pv= (void*)memalign(8, width*height*2*sizeof(int32_t));
+	vf->priv->pv= av_malloc(width*height*2*sizeof(int32_t));
 	initPv(vf->priv, width, height);
 
 	for(i=0; i<SUB_PIXELS; i++){
@@ -132,7 +134,7 @@ static int config(struct vf_instance *vf,
 static void uninit(struct vf_instance *vf){
 	if(!vf->priv) return;
 
-	free(vf->priv->pv);
+	av_free(vf->priv->pv);
 	vf->priv->pv= NULL;
 
 	free(vf->priv);
diff --git a/libmpcodecs/vf_pp7.c b/libmpcodecs/vf_pp7.c
index 32e9a581c2..58f3e3ef06 100644
--- a/libmpcodecs/vf_pp7.c
+++ b/libmpcodecs/vf_pp7.c
@@ -34,6 +34,8 @@
 #include <malloc.h>
 #endif
 
+#include "libavutil/mem.h"
+
 #include "img_format.h"
 #include "mp_image.h"
 #include "vf.h"
@@ -350,7 +352,7 @@ static int config(struct vf_instance *vf,
     int h= (height+16+15)&(~15);
 
     vf->priv->temp_stride= (width+16+15)&(~15);
-    vf->priv->src = memalign(8, vf->priv->temp_stride*(h+8)*sizeof(uint8_t));
+    vf->priv->src = av_malloc(vf->priv->temp_stride*(h+8)*sizeof(uint8_t));
 
     return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
 }
@@ -410,7 +412,7 @@ static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
 static void uninit(struct vf_instance *vf){
     if(!vf->priv) return;
 
-    free(vf->priv->src);
+    av_free(vf->priv->src);
     vf->priv->src= NULL;
 
     free(vf->priv);
diff --git a/libmpcodecs/vf_sab.c b/libmpcodecs/vf_sab.c
index 7dccd21d10..7ab76ffbe9 100644
--- a/libmpcodecs/vf_sab.c
+++ b/libmpcodecs/vf_sab.c
@@ -95,7 +95,7 @@ static int allocStuff(FilterParam *f, int width, int height){
 	SwsVector *vec;
 	SwsFilter swsF;
 	int i,x,y;
-	f->preFilterBuf= (uint8_t*)memalign(8, stride*height);
+	f->preFilterBuf= av_malloc(stride*height);
 	f->preFilterStride= stride;
 
 	vec = sws_getGaussianVec(f->preFilterRadius, f->quality);
@@ -119,7 +119,7 @@ static int allocStuff(FilterParam *f, int width, int height){
 	vec = sws_getGaussianVec(f->radius, f->quality);
 	f->distWidth= vec->length;
 	f->distStride= (vec->length+7)&~7;
-	f->distCoeff= (int32_t*)memalign(8, f->distWidth*f->distStride*sizeof(int32_t));
+	f->distCoeff= av_malloc(f->distWidth*f->distStride*sizeof(int32_t));
 
 	for(y=0; y<vec->length; y++){
 		for(x=0; x<vec->length; x++){
@@ -153,10 +153,10 @@ static void freeBuffers(FilterParam *f){
 	if(f->preFilterContext) sws_freeContext(f->preFilterContext);
 	f->preFilterContext=NULL;
 
-	free(f->preFilterBuf);
+	av_free(f->preFilterBuf);
 	f->preFilterBuf=NULL;
 
-	free(f->distCoeff);
+	av_free(f->distCoeff);
 	f->distCoeff=NULL;
 }
 
-- 
cgit v1.2.3