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.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.c')
| -rw-r--r-- | libmpcodecs/vf.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c index 65c2f17a58..0f2dcc75d2 100644 --- a/libmpcodecs/vf.c +++ b/libmpcodecs/vf.c @@ -39,6 +39,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; @@ -356,7 +357,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"); } |