summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf.c
diff options
context:
space:
mode:
authorzuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-04-20 04:33:00 +0000
committerzuxy <zuxy@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-04-20 04:33:00 +0000
commit6fe158d7e74d7fc6b23da1605be9aa7bbb187859 (patch)
tree2fe136d3b3a4acb5c74e7a9642f474c3a6931f3d /libmpcodecs/vf.c
parent57b5a5cf652922d167958ce35a4a8c8ccb287e1f (diff)
downloadmpv-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.c')
-rw-r--r--libmpcodecs/vf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index 02b0f1a8b1..0760b09602 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -40,6 +40,7 @@
#include "vf.h"
#include "libvo/fastmemcpy.h"
+#include "libavutil/mem.h"
extern const vf_info_t vf_info_vo;
extern const vf_info_t vf_info_rectangle;
@@ -350,7 +351,7 @@ mp_image_t* vf_get_image(vf_instance_t* vf, unsigned int outfmt, int mp_imgtype,
if(mpi->flags&MP_IMGFLAG_ALLOCATED){
if(mpi->width<w2 || mpi->height<h){
// need to re-allocate buffer memory:
- free(mpi->planes[0]);
+ av_free(mpi->planes[0]);
mpi->flags&=~MP_IMGFLAG_ALLOCATED;
mp_msg(MSGT_VFILTER,MSGL_V,"vf.c: have to REALLOCATE buffer memory :(\n");
}