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_unsharp.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_unsharp.c')
-rw-r--r-- | libmpcodecs/vf_unsharp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpcodecs/vf_unsharp.c b/libmpcodecs/vf_unsharp.c index 2afd866342..5d6b33f290 100644 --- a/libmpcodecs/vf_unsharp.c +++ b/libmpcodecs/vf_unsharp.c @@ -143,7 +143,7 @@ static int config( struct vf_instance* vf, stepsX = fp->msizeX/2; stepsY = fp->msizeY/2; for( z=0; z<2*stepsY; z++ ) - fp->SC[z] = memalign( 16, sizeof(*(fp->SC[z])) * (width+2*stepsX) ); + fp->SC[z] = av_malloc(sizeof(*(fp->SC[z])) * (width+2*stepsX)); fp = &vf->priv->chromaParam; effect = fp->amount == 0 ? "don't touch" : fp->amount < 0 ? "blur" : "sharpen"; @@ -152,7 +152,7 @@ static int config( struct vf_instance* vf, stepsX = fp->msizeX/2; stepsY = fp->msizeY/2; for( z=0; z<2*stepsY; z++ ) - fp->SC[z] = memalign( 16, sizeof(*(fp->SC[z])) * (width+2*stepsX) ); + fp->SC[z] = av_malloc(sizeof(*(fp->SC[z])) * (width+2*stepsX)); return vf_next_config( vf, width, height, d_width, d_height, flags, outfmt ); } @@ -212,12 +212,12 @@ static void uninit( struct vf_instance* vf ) { fp = &vf->priv->lumaParam; for( z=0; z<sizeof(fp->SC)/sizeof(fp->SC[0]); z++ ) { - if( fp->SC[z] ) free( fp->SC[z] ); + if( fp->SC[z] ) av_free( fp->SC[z] ); fp->SC[z] = NULL; } fp = &vf->priv->chromaParam; for( z=0; z<sizeof(fp->SC)/sizeof(fp->SC[0]); z++ ) { - if( fp->SC[z] ) free( fp->SC[z] ); + if( fp->SC[z] ) av_free( fp->SC[z] ); fp->SC[z] = NULL; } |