diff options
author | zuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-04-20 04:33:00 +0000 |
---|---|---|
committer | zuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-04-20 04:33:00 +0000 |
commit | 6fe158d7e74d7fc6b23da1605be9aa7bbb187859 (patch) | |
tree | 2fe136d3b3a4acb5c74e7a9642f474c3a6931f3d /libmpcodecs/vf_unsharp.c | |
parent | 57b5a5cf652922d167958ce35a4a8c8ccb287e1f (diff) | |
download | mpv-6fe158d7e74d7fc6b23da1605be9aa7bbb187859.tar.bz2 mpv-6fe158d7e74d7fc6b23da1605be9aa7bbb187859.tar.xz |
Replace memalign(x) (x > 8) by av_malloc() to prevent crashes on systems
lacking memalign(), e.g. Win32.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31045 b3059339-0415-0410-9bf9-f77b7e298cf2
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 dd0bec03ff..ae5f13654f 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; } |