Mercurial > mplayer.hg
comparison libmpcodecs/vf_pp7.c @ 32747:170106dd2ef2
Replace memalign() by av_malloc() in libmpcodecs. as it is not available in all platforms
ported from ffmpeg
author | michael |
---|---|
date | Sun, 30 Jan 2011 22:57:16 +0000 |
parents | 7af3e6f901fd |
children | d6bc33320ae0 |
comparison
equal
deleted
inserted
replaced
32746:2372e26d24fe | 32747:170106dd2ef2 |
---|---|
348 int width, int height, int d_width, int d_height, | 348 int width, int height, int d_width, int d_height, |
349 unsigned int flags, unsigned int outfmt){ | 349 unsigned int flags, unsigned int outfmt){ |
350 int h= (height+16+15)&(~15); | 350 int h= (height+16+15)&(~15); |
351 | 351 |
352 vf->priv->temp_stride= (width+16+15)&(~15); | 352 vf->priv->temp_stride= (width+16+15)&(~15); |
353 vf->priv->src = memalign(8, vf->priv->temp_stride*(h+8)*sizeof(uint8_t)); | 353 vf->priv->src = av_malloc(vf->priv->temp_stride*(h+8)*sizeof(uint8_t)); |
354 | 354 |
355 return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); | 355 return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); |
356 } | 356 } |
357 | 357 |
358 static void get_image(struct vf_instance *vf, mp_image_t *mpi){ | 358 static void get_image(struct vf_instance *vf, mp_image_t *mpi){ |
408 } | 408 } |
409 | 409 |
410 static void uninit(struct vf_instance *vf){ | 410 static void uninit(struct vf_instance *vf){ |
411 if(!vf->priv) return; | 411 if(!vf->priv) return; |
412 | 412 |
413 free(vf->priv->src); | 413 av_free(vf->priv->src); |
414 vf->priv->src= NULL; | 414 vf->priv->src= NULL; |
415 | 415 |
416 free(vf->priv); | 416 free(vf->priv); |
417 vf->priv=NULL; | 417 vf->priv=NULL; |
418 } | 418 } |