# HG changeset patch # User diego # Date 1128505148 0 # Node ID 044b85964c05e69bfc8f2c4489c29f90ba0e5d3e # Parent c2ebd1b1e49066dc947ae6e427bd5e87796420f3 Compilation fix for systems lacking lrintf like e.g. NetBSD. patch by Jan Knutar < jknutar -- at -- nic -- dot -- fi > and me diff -r c2ebd1b1e490 -r 044b85964c05 libmpcodecs/vf_qp.c --- a/libmpcodecs/vf_qp.c Tue Oct 04 23:37:54 2005 +0000 +++ b/libmpcodecs/vf_qp.c Wed Oct 05 09:39:08 2005 +0000 @@ -36,14 +36,24 @@ void *opaque); #endif +// Needed to bring in lrintf. +#define HAVE_AV_CONFIG_H + #ifdef USE_LIBAVCODEC_SO #include #include +#include #else #include "../libavcodec/avcodec.h" #include "../libavcodec/dsputil.h" +#include "../libavutil/common.h" #endif +/* FIXME: common.h defines printf away when HAVE_AV_CONFIG + * is defined, but mp_image.h needs printf. + */ +#undef printf + #ifdef HAVE_MALLOC_H #include #endif @@ -68,7 +78,7 @@ int i; vf->priv->qp_stride= (width+15)>>4; - vf->priv->qp= malloc(vf->priv->qp_stride*h*sizeof(int8_t)); + vf->priv->qp= av_malloc(vf->priv->qp_stride*h*sizeof(int8_t)); for(i=-129; i<128; i++){ double const_values[]={ @@ -155,10 +165,10 @@ static void uninit(struct vf_instance_s* vf){ if(!vf->priv) return; - if(vf->priv->qp) free(vf->priv->qp); + if(vf->priv->qp) av_free(vf->priv->qp); vf->priv->qp= NULL; - free(vf->priv); + av_free(vf->priv); vf->priv=NULL; } @@ -168,7 +178,7 @@ vf->put_image=put_image; vf->get_image=get_image; vf->uninit=uninit; - vf->priv=malloc(sizeof(struct vf_priv_s)); + vf->priv=av_malloc(sizeof(struct vf_priv_s)); memset(vf->priv, 0, sizeof(struct vf_priv_s)); // avcodec_init();