diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:46:18 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-04-26 18:46:18 +0300 |
| commit | 9a34ae4fd05226feb5b82573a4283c3cd8586b8a (patch) | |
| tree | 157e9ea076c46fe37e626704a7b81c6e8b2a6db3 /libmpcodecs/vf_noise.c | |
| parent | 8df340271e868252e7398307e126ea12083d426b (diff) | |
| parent | 91a84df7d0b19ca510a78191233f17c2d7691b95 (diff) | |
| download | mpv-9a34ae4fd05226feb5b82573a4283c3cd8586b8a.tar.bz2 mpv-9a34ae4fd05226feb5b82573a4283c3cd8586b8a.tar.xz | |
Merge svn changes up to r31050
Diffstat (limited to 'libmpcodecs/vf_noise.c')
| -rw-r--r-- | libmpcodecs/vf_noise.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libmpcodecs/vf_noise.c b/libmpcodecs/vf_noise.c index 9242df8339..59835daf50 100644 --- a/libmpcodecs/vf_noise.c +++ b/libmpcodecs/vf_noise.c @@ -36,6 +36,7 @@ #include "mp_image.h" #include "vf.h" #include "libvo/fastmemcpy.h" +#include "libavutil/mem.h" #define MAX_NOISE 4096 #define MAX_SHIFT 1024 @@ -80,7 +81,7 @@ static int8_t *initNoise(FilterParam *fp){ int uniform= fp->uniform; int averaged= fp->averaged; int pattern= fp->pattern; - int8_t *noise= memalign(16, MAX_NOISE*sizeof(int8_t)); + int8_t *noise= av_malloc(MAX_NOISE*sizeof(int8_t)); int i, j; srand(123457); @@ -369,10 +370,10 @@ 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; - if(vf->priv->chromaParam.noise) free(vf->priv->chromaParam.noise); + if(vf->priv->chromaParam.noise) av_free(vf->priv->chromaParam.noise); vf->priv->chromaParam.noise= NULL; - if(vf->priv->lumaParam.noise) free(vf->priv->lumaParam.noise); + if(vf->priv->lumaParam.noise) av_free(vf->priv->lumaParam.noise); vf->priv->lumaParam.noise= NULL; free(vf->priv); |