virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

Remove useage of memalign() from libmpcodecs, not all platforms have memalign().

Browse Source
This commit is contained in:
Michael Niedermayer 2011-01-28 21:54:16 +01:00
parent 609bdf813d
commit 55fa97e215
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/libmpcodecs/vf_perspective.c
View File

@ -108,7 +108,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 +132,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);

4
libavfilter/libmpcodecs/vf_pp7.c
View File

@ -350,7 +350,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 +410,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);

8
libavfilter/libmpcodecs/vf_sab.c
View File

@ -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;
}