[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[251] mplayerxp

[<nic...@us...>]

Revision: 251
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=251&view=rev
Author:   nickols_k
Date:     2012-10-29 15:54:02 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
use random malloc everywhere

Modified Paths:
--------------
    mplayerxp/dump.c
    mplayerxp/fifo.c
    mplayerxp/fifo.h
    mplayerxp/input/input.c
    mplayerxp/input/input.h
    mplayerxp/input/lirc.c
    mplayerxp/libao2/ao_alsa9.c
    mplayerxp/libao2/ao_arts.c
    mplayerxp/libao2/ao_esd.c
    mplayerxp/libao2/ao_jack.c
    mplayerxp/libao2/ao_nas.c
    mplayerxp/libao2/ao_null.c
    mplayerxp/libao2/ao_openal.c
    mplayerxp/libao2/ao_oss.c
    mplayerxp/libao2/ao_sdl.c
    mplayerxp/libao2/ao_wav.c
    mplayerxp/libao2/audio_out.c
    mplayerxp/libmpcodecs/ad_a52.c
    mplayerxp/libmpcodecs/ad_acm.c
    mplayerxp/libmpcodecs/ad_dca.c
    mplayerxp/libmpcodecs/ad_dmo.c
    mplayerxp/libmpcodecs/ad_dshow.c
    mplayerxp/libmpcodecs/ad_faad.c
    mplayerxp/libmpcodecs/ad_ffmp3.c
    mplayerxp/libmpcodecs/ad_hwac3.c
    mplayerxp/libmpcodecs/ad_libdv.c
    mplayerxp/libmpcodecs/ad_mp3.c
    mplayerxp/libmpcodecs/ad_real.c
    mplayerxp/libmpcodecs/ad_twin.c
    mplayerxp/libmpcodecs/ad_vorbis.c
    mplayerxp/libmpcodecs/dec_audio.c
    mplayerxp/libmpcodecs/dec_video.c
    mplayerxp/libmpcodecs/liba52/a52.h
    mplayerxp/libmpcodecs/liba52/a52_internal.h
    mplayerxp/libmpcodecs/liba52/bit_allocate.c
    mplayerxp/libmpcodecs/liba52/bitstream.c
    mplayerxp/libmpcodecs/liba52/bitstream.h
    mplayerxp/libmpcodecs/liba52/crc.c
    mplayerxp/libmpcodecs/liba52/downmix.c
    mplayerxp/libmpcodecs/liba52/downmix_mmx.h
    mplayerxp/libmpcodecs/liba52/imdct.c
    mplayerxp/libmpcodecs/liba52/imdct_mmx.h
    mplayerxp/libmpcodecs/liba52/parse.c
    mplayerxp/libmpcodecs/liba52/tables.h
    mplayerxp/libmpcodecs/libdca/bitstream.c
    mplayerxp/libmpcodecs/libdca/bitstream.h
    mplayerxp/libmpcodecs/libdca/dca.h
    mplayerxp/libmpcodecs/libdca/dca_internal.h
    mplayerxp/libmpcodecs/libdca/downmix.c
    mplayerxp/libmpcodecs/libdca/parse.c
    mplayerxp/libmpcodecs/libdca/tables.h
    mplayerxp/libmpcodecs/libdca/tables_adpcm.h
    mplayerxp/libmpcodecs/libdca/tables_fir.h
    mplayerxp/libmpcodecs/libdca/tables_huffman.h
    mplayerxp/libmpcodecs/libdca/tables_quantization.h
    mplayerxp/libmpcodecs/libdca/tables_vq.h
    mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.c
    mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.h
    mplayerxp/libmpcodecs/libnuppelvideo/lzoconf.h
    mplayerxp/libmpcodecs/libnuppelvideo/minilzo.c
    mplayerxp/libmpcodecs/libnuppelvideo/minilzo.h
    mplayerxp/libmpcodecs/libnuppelvideo/nuppelvideo.c
    mplayerxp/libmpcodecs/vd.c
    mplayerxp/libmpcodecs/vd_divx4.c
    mplayerxp/libmpcodecs/vd_ffmpeg.c
    mplayerxp/libmpcodecs/vd_huffyuv.c
    mplayerxp/libmpcodecs/vd_libmpeg2.c
    mplayerxp/libmpcodecs/vd_qtvideo.c
    mplayerxp/libmpcodecs/vd_real.c
    mplayerxp/libmpcodecs/vd_theora.c
    mplayerxp/libmpcodecs/vd_vfw.c
    mplayerxp/libmpcodecs/vd_xanim.c
    mplayerxp/libmpcodecs/vd_xvid.c
    mplayerxp/libmpconf/cfgparser.c
    mplayerxp/libmpconf/cfgparser.h
    mplayerxp/libmpconf/codec-cfg.c
    mplayerxp/libmpconf/m_option.c
    mplayerxp/libmpconf/m_option.h
    mplayerxp/libmpconf/m_property.c
    mplayerxp/libmpconf/m_struct.c
    mplayerxp/libmpconf/subopt-helper.c
    mplayerxp/libmpconf/subopt-helper.h
    mplayerxp/libmpdemux/asf_mmst_streaming.c
    mplayerxp/libmpdemux/asf_streaming.c
    mplayerxp/libmpdemux/cache2.c
    mplayerxp/libmpdemux/cdda.c
    mplayerxp/libmpdemux/cddb.c
    mplayerxp/libmpdemux/cookies.c
    mplayerxp/libmpdemux/demux_aiff.c
    mplayerxp/libmpdemux/demux_asf.c
    mplayerxp/libmpdemux/demux_audio.c
    mplayerxp/libmpdemux/demux_avi.c
    mplayerxp/libmpdemux/demux_bmp.c
    mplayerxp/libmpdemux/demux_demuxers.c
    mplayerxp/libmpdemux/demux_dv.c
    mplayerxp/libmpdemux/demux_film.c
    mplayerxp/libmpdemux/demux_fli.c
    mplayerxp/libmpdemux/demux_lavf.c
    mplayerxp/libmpdemux/demux_mkv.c
    mplayerxp/libmpdemux/demux_mov.c
    mplayerxp/libmpdemux/demux_mpg.c
    mplayerxp/libmpdemux/demux_mpxp64.c
    mplayerxp/libmpdemux/demux_nsv.c
    mplayerxp/libmpdemux/demux_nuv.c
    mplayerxp/libmpdemux/demux_ogg.c
    mplayerxp/libmpdemux/demux_pva.c
    mplayerxp/libmpdemux/demux_ra.c
    mplayerxp/libmpdemux/demux_rawaudio.c
    mplayerxp/libmpdemux/demux_real.c
    mplayerxp/libmpdemux/demux_roq.c
    mplayerxp/libmpdemux/demux_smjpeg.c
    mplayerxp/libmpdemux/demux_ts.c
    mplayerxp/libmpdemux/demux_ty.c
    mplayerxp/libmpdemux/demux_viv.c
    mplayerxp/libmpdemux/demux_vqf.c
    mplayerxp/libmpdemux/demux_y4m.c
    mplayerxp/libmpdemux/demuxer.c
    mplayerxp/libmpdemux/demuxer.h
    mplayerxp/libmpdemux/freesdp/common.c
    mplayerxp/libmpdemux/freesdp/common.h
    mplayerxp/libmpdemux/freesdp/errorlist.c
    mplayerxp/libmpdemux/freesdp/parser.c
    mplayerxp/libmpdemux/freesdp/parser.h
    mplayerxp/libmpdemux/freesdp/parserpriv.h
    mplayerxp/libmpdemux/freesdp/priv.h
    mplayerxp/libmpdemux/http.c
    mplayerxp/libmpdemux/librtsp/Makefile
    mplayerxp/libmpdemux/librtsp/rtsp.c
    mplayerxp/libmpdemux/librtsp/rtsp.h
    mplayerxp/libmpdemux/librtsp/rtsp_rtp.c
    mplayerxp/libmpdemux/librtsp/rtsp_rtp.h
    mplayerxp/libmpdemux/librtsp/rtsp_session.c
    mplayerxp/libmpdemux/librtsp/rtsp_session.h
    mplayerxp/libmpdemux/mpeg_hdr.c
    mplayerxp/libmpdemux/mrl.c
    mplayerxp/libmpdemux/mrl.h
    mplayerxp/libmpdemux/mux_lavf.c
    mplayerxp/libmpdemux/mux_mpxp64.c
    mplayerxp/libmpdemux/mux_raw.c
    mplayerxp/libmpdemux/muxer.c
    mplayerxp/libmpdemux/muxer.h
    mplayerxp/libmpdemux/network.c
    mplayerxp/libmpdemux/parse_mp4.c
    mplayerxp/libmpdemux/pnm.c
    mplayerxp/libmpdemux/pnm.h
    mplayerxp/libmpdemux/realrtsp/Makefile
    mplayerxp/libmpdemux/realrtsp/asmrp.c
    mplayerxp/libmpdemux/realrtsp/asmrp.h
    mplayerxp/libmpdemux/realrtsp/md5.c
    mplayerxp/libmpdemux/realrtsp/md5.h
    mplayerxp/libmpdemux/realrtsp/real.c
    mplayerxp/libmpdemux/realrtsp/real.h
    mplayerxp/libmpdemux/realrtsp/rmff.c
    mplayerxp/libmpdemux/realrtsp/rmff.h
    mplayerxp/libmpdemux/realrtsp/sdpplin.c
    mplayerxp/libmpdemux/realrtsp/sdpplin.h
    mplayerxp/libmpdemux/realrtsp/xbuffer.c
    mplayerxp/libmpdemux/s_cdd.c
    mplayerxp/libmpdemux/s_dvdnav.c
    mplayerxp/libmpdemux/s_dvdread.c
    mplayerxp/libmpdemux/s_ffmpeg.c
    mplayerxp/libmpdemux/s_file.c
    mplayerxp/libmpdemux/s_ftp.c
    mplayerxp/libmpdemux/s_network.c
    mplayerxp/libmpdemux/s_oss.c
    mplayerxp/libmpdemux/s_rtsp.c
    mplayerxp/libmpdemux/s_tv.c
    mplayerxp/libmpdemux/s_vcdnav.c
    mplayerxp/libmpdemux/stream.c
    mplayerxp/libmpdemux/sub_cc.c
    mplayerxp/libmpdemux/sub_ty.c
    mplayerxp/libmpdemux/tcp.h
    mplayerxp/libmpdemux/tvi_bsdbt848.c
    mplayerxp/libmpdemux/tvi_def.h
    mplayerxp/libmpdemux/tvi_dummy.c
    mplayerxp/libmpdemux/tvi_v4l.c
    mplayerxp/libmpdemux/udp.c
    mplayerxp/libmpdemux/udp.h
    mplayerxp/libmpdemux/url.c
    mplayerxp/libmpdemux/video.c
    mplayerxp/libmpdemux/yuv4mpeg.c
    mplayerxp/libmpdemux/yuv4mpeg.h
    mplayerxp/libmpdemux/yuv4mpeg_intern.h
    mplayerxp/libmpdemux/yuv4mpeg_ratio.c
    mplayerxp/libmpsub/spudec.c
    mplayerxp/libmpsub/subreader.c
    mplayerxp/libmpsub/vobsub.c
    mplayerxp/libplaytree/asxparser.c
    mplayerxp/libplaytree/asxparser.h
    mplayerxp/libplaytree/playtree.c
    mplayerxp/libplaytree/playtree.h
    mplayerxp/libplaytree/playtreeparser.c
    mplayerxp/libvo/font_load.c
    mplayerxp/libvo/jpeg_enc.c
    mplayerxp/libvo/jpeg_enc.h
    mplayerxp/libvo/osd.c
    mplayerxp/libvo/screenshot.c
    mplayerxp/libvo/sub.c
    mplayerxp/libvo/video_out.c
    mplayerxp/libvo/video_out_internal.h
    mplayerxp/libvo/vo_dga.c
    mplayerxp/libvo/vo_fbdev.c
    mplayerxp/libvo/vo_null.c
    mplayerxp/libvo/vo_opengl.c
    mplayerxp/libvo/vo_sdl.c
    mplayerxp/libvo/vo_vesa.c
    mplayerxp/libvo/vo_x11.c
    mplayerxp/libvo/vo_xv.c
    mplayerxp/libvo/vo_xvidix.c
    mplayerxp/libvo/vosub_vidix.c
    mplayerxp/libvo/x11_common.c
    mplayerxp/loader/afl.c
    mplayerxp/loader/dmo/DMO_AudioDecoder.c
    mplayerxp/loader/dmo/DMO_VideoDecoder.c
    mplayerxp/loader/dmo/buffer.c
    mplayerxp/loader/dmo/dmo.c
    mplayerxp/loader/driver.c
    mplayerxp/loader/dshow/DS_AudioDecoder.c
    mplayerxp/loader/dshow/DS_Filter.c
    mplayerxp/loader/dshow/DS_VideoDecoder.c
    mplayerxp/loader/dshow/allocator.c
    mplayerxp/loader/dshow/cmediasample.c
    mplayerxp/loader/dshow/inputpin.c
    mplayerxp/loader/dshow/mediatype.c
    mplayerxp/loader/dshow/outputpin.c
    mplayerxp/loader/dshow/test.c
    mplayerxp/loader/elfdll.c
    mplayerxp/loader/ext.c
    mplayerxp/loader/ldt_keeper.c
    mplayerxp/loader/mangle.h
    mplayerxp/loader/module.c
    mplayerxp/loader/pe_image.c
    mplayerxp/loader/registry.c
    mplayerxp/loader/vfl.c
    mplayerxp/loader/win32.c
    mplayerxp/mp_image.c
    mplayerxp/mp_msg.c
    mplayerxp/mplayer.c
    mplayerxp/nls/nls.h
    mplayerxp/nls/recode.c
    mplayerxp/osdep/Makefile
    mplayerxp/osdep/cpudetect.c
    mplayerxp/osdep/cpudetect.h
    mplayerxp/osdep/get_path.c
    mplayerxp/osdep/lrmi.c
    mplayerxp/osdep/lrmi.h
    mplayerxp/osdep/mangle.h
    mplayerxp/osdep/mm_accel.h
    mplayerxp/postproc/af.c
    mplayerxp/postproc/af_ao2.c
    mplayerxp/postproc/af_center.c
    mplayerxp/postproc/af_channels.c
    mplayerxp/postproc/af_comp.c
    mplayerxp/postproc/af_crystality.c
    mplayerxp/postproc/af_delay.c
    mplayerxp/postproc/af_dummy.c
    mplayerxp/postproc/af_dyn.c
    mplayerxp/postproc/af_echo3d.c
    mplayerxp/postproc/af_equalizer.c
    mplayerxp/postproc/af_export.c
    mplayerxp/postproc/af_extrastereo.c
    mplayerxp/postproc/af_ffenc.c
    mplayerxp/postproc/af_format.c
    mplayerxp/postproc/af_gate.c
    mplayerxp/postproc/af_hrtf.c
    mplayerxp/postproc/af_karaoke.c
    mplayerxp/postproc/af_lp.c
    mplayerxp/postproc/af_pan.c
    mplayerxp/postproc/af_raw.c
    mplayerxp/postproc/af_resample.c
    mplayerxp/postproc/af_scaletempo.c
    mplayerxp/postproc/af_sinesuppress.c
    mplayerxp/postproc/af_sub.c
    mplayerxp/postproc/af_surround.c
    mplayerxp/postproc/af_volnorm.c
    mplayerxp/postproc/af_volume.c
    mplayerxp/postproc/libmenu/Makefile
    mplayerxp/postproc/libmenu/menu.c
    mplayerxp/postproc/libmenu/menu_cmdlist.c
    mplayerxp/postproc/libmenu/menu_console.c
    mplayerxp/postproc/libmenu/menu_filesel.c
    mplayerxp/postproc/libmenu/menu_list.c
    mplayerxp/postproc/libmenu/menu_param.c
    mplayerxp/postproc/libmenu/menu_pt.c
    mplayerxp/postproc/libmenu/menu_txt.c
    mplayerxp/postproc/swscale.h
    mplayerxp/postproc/vf.c
    mplayerxp/postproc/vf_1bpp.c
    mplayerxp/postproc/vf_aspect.c
    mplayerxp/postproc/vf_delogo.c
    mplayerxp/postproc/vf_denoise3d.c
    mplayerxp/postproc/vf_dint.c
    mplayerxp/postproc/vf_down3dright.c
    mplayerxp/postproc/vf_eq.c
    mplayerxp/postproc/vf_expand.c
    mplayerxp/postproc/vf_flip.c
    mplayerxp/postproc/vf_format.c
    mplayerxp/postproc/vf_framestep.c
    mplayerxp/postproc/vf_il.c
    mplayerxp/postproc/vf_menu.c
    mplayerxp/postproc/vf_mirror.c
    mplayerxp/postproc/vf_noise.c
    mplayerxp/postproc/vf_ow.c
    mplayerxp/postproc/vf_palette.c
    mplayerxp/postproc/vf_panscan.c
    mplayerxp/postproc/vf_perspective.c
    mplayerxp/postproc/vf_pp.c
    mplayerxp/postproc/vf_raw.c
    mplayerxp/postproc/vf_rectangle.c
    mplayerxp/postproc/vf_rgb2bgr.c
    mplayerxp/postproc/vf_rotate.c
    mplayerxp/postproc/vf_scale.c
    mplayerxp/postproc/vf_smartblur.c
    mplayerxp/postproc/vf_softpulldown.c
    mplayerxp/postproc/vf_swapuv.c
    mplayerxp/postproc/vf_test.c
    mplayerxp/postproc/vf_unsharp.c
    mplayerxp/postproc/vf_vo.c
    mplayerxp/postproc/vf_yuvcsp.c
    mplayerxp/sig_hand.c
    mplayerxp/xmp_core.c

Added Paths:
-----------
    mplayerxp/osdep/mp_malloc.c
    mplayerxp/osdep/mplib.c
    mplayerxp/osdep/mplib.h

Removed Paths:
-------------
    mplayerxp/osdep/my_malloc.c
    mplayerxp/osdep/my_malloc.h
    mplayerxp/osdep/my_profile.c
    mplayerxp/osdep/my_profile.h

Modified: mplayerxp/dump.c
===================================================================
--- mplayerxp/dump.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/dump.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -16,6 +16,7 @@
 #include "mplayer.h"
 #include "libmpdemux/muxer.h"
 #include "libmpdemux/mrl.h"
+#include "osdep/mplib.h"
 #define MSGT_CLASS MSGT_GLOBAL
 #include "__mp_msg.h"
 
@@ -118,7 +119,7 @@
   char stream_dump_name[1024];
   /* TODO copy it from demuxer */
   if(demuxer->priv) return;
-  demuxer->priv=malloc(sizeof(priv_t));
+  demuxer->priv=mp_malloc(sizeof(priv_t));
   priv_t*priv=demuxer->priv;
   memset(priv,0,sizeof(priv_t));
   /* describe other useless dumps */
@@ -162,7 +163,7 @@
     priv->m_audio->codec=0;
     if(!sha->wf)
     {
-	sha->wf=malloc(sizeof(WAVEFORMATEX));
+	sha->wf=mp_malloc(sizeof(WAVEFORMATEX));
 	sha->wf->nBlockAlign = 1; //mux_a->h.dwSampleSize;
 	sha->wf->wFormatTag = sha->wtag;
 	sha->wf->nChannels = sha->channels;
@@ -171,12 +172,12 @@
 	sha->wf->wBitsPerSample = 16; // FIXME
 	sha->wf->cbSize=0; // FIXME for l3codeca.acm
     }
-    priv->m_audio->wf=malloc(sha->wf->cbSize+sizeof(WAVEFORMATEX));
+    priv->m_audio->wf=mp_malloc(sha->wf->cbSize+sizeof(WAVEFORMATEX));
     memcpy(priv->m_audio->wf,sha->wf,sha->wf->cbSize+sizeof(WAVEFORMATEX));
     if(!sha->wf->cbSize && sha->codecdata_len)
     {
 	priv->m_audio->wf->cbSize=sha->wf->cbSize=sha->codecdata_len;
-	priv->m_audio->wf=realloc(priv->m_audio->wf,sha->wf->cbSize+sizeof(WAVEFORMATEX));
+	priv->m_audio->wf=mp_realloc(priv->m_audio->wf,sha->wf->cbSize+sizeof(WAVEFORMATEX));
 	memcpy((char *)(priv->m_audio->wf+1),sha->codecdata,sha->codecdata_len);
     }
     if(!sha->i_bps) sha->i_bps=priv->m_audio->wf->nAvgBytesPerSec;
@@ -202,7 +203,7 @@
     priv->m_video->h.dwSuggestedBufferSize=shv->video.dwSuggestedBufferSize;
     if(!shv->bih)
     {
-	shv->bih=malloc(sizeof(BITMAPINFOHEADER));
+	shv->bih=mp_malloc(sizeof(BITMAPINFOHEADER));
 	shv->bih->biSize=sizeof(BITMAPINFOHEADER);
 	shv->bih->biWidth=shv->src_w;
 	shv->bih->biHeight=shv->src_h;
@@ -211,7 +212,7 @@
 	shv->bih->biBitCount=24; // FIXME!!!
 	shv->bih->biSizeImage=shv->bih->biWidth*shv->bih->biHeight*(shv->bih->biBitCount/8);
     }
-    priv->m_video->bih=malloc(shv->bih->biSize);
+    priv->m_video->bih=mp_malloc(shv->bih->biSize);
     memcpy(priv->m_video->bih,shv->bih,shv->bih->biSize);
     priv->m_video->ImageDesc=shv->ImageDesc;
     priv->m_video->aspect=shv->aspect;
@@ -285,7 +286,7 @@
 	fseeko(priv->mux_file,0,SEEK_SET);
 	muxer_write_header(priv->muxer,demuxer);
 	fclose(priv->mux_file);
-	free(demuxer->priv);
+	mp_free(demuxer->priv);
 	demuxer->priv=NULL;
     }
     MSG_INFO(MSGTR_CoreDumped);

Modified: mplayerxp/fifo.c
===================================================================
--- mplayerxp/fifo.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/fifo.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -1,5 +1,6 @@
 #include "mplayer.h"
 #include "fifo.h"
+#include "osdep/mplib.h"
 
 #ifndef min
 #define min(a,b) ((a)<(b)?(a):(b))
@@ -81,15 +82,15 @@
 
 CBFifoBuffer *cb_fifo_alloc(unsigned int size)
 {
-    CBFifoBuffer *f= malloc(sizeof(CBFifoBuffer));
+    CBFifoBuffer *f= mp_malloc(sizeof(CBFifoBuffer));
     if(!f)
         return NULL;
     memset(f,0,sizeof(CBFifoBuffer));
-    f->buffer = malloc(size);
+    f->buffer = mp_malloc(size);
     f->end = f->buffer + size;
     cb_fifo_reset(f);
     if (!f->buffer)
-        free(f);
+        mp_free(f);
     return f;
 }
 
@@ -105,13 +106,21 @@
         cb_fifo_generic_read(f, f2->buffer, len, NULL);
         f2->wptr += len;
         f2->wndx += len;
-        free(f->buffer);
+        mp_free(f->buffer);
         *f= *f2;
-        free(f2);
+        mp_free(f2);
     }
     return 0;
 }
 
+void cb_fifo_free(CBFifoBuffer *f)
+{
+    if(f){
+        mp_free(f->buffer);
+        mp_free(f);
+    }
+}
+
 int cb_fifo_generic_write(CBFifoBuffer *f, any_t*src, int size, int (*func)(any_t*, any_t*, int))
 {
     int total = size;

Modified: mplayerxp/fifo.h
===================================================================
--- mplayerxp/fifo.h	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/fifo.h	2012-10-29 15:54:02 UTC (rev 251)
@@ -35,15 +35,9 @@
 
 /**
  * Frees an CBFifoBuffer.
- * @param *f CBFifoBuffer to free
+ * @param *f CBFifoBuffer to mp_free
  */
-static inline void cb_fifo_free(CBFifoBuffer *f)
-{
-    if(f){
-        free(f->buffer);
-        free(f);
-    }
-}
+void cb_fifo_free(CBFifoBuffer *f);
 
 /**
  * Resets the CBFifoBuffer to the state right after cb_fifo_alloc, in particular it is emptied.

Modified: mplayerxp/input/input.c
===================================================================
--- mplayerxp/input/input.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/input/input.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -22,6 +22,7 @@
 #include "osdep/keycodes.h"
 #include "osdep/get_path.h"
 #include "osdep/timer.h"
+#include "osdep/mplib.h"
 #include "libmpconf/cfgparser.h"
 
 #include "joystick.h"
@@ -470,7 +471,7 @@
   if(cmd_fds[i].close_func)
     cmd_fds[i].close_func(cmd_fds[i].fd);
   if(cmd_fds[i].buffer)
-    free(cmd_fds[i].buffer);
+    mp_free(cmd_fds[i].buffer);
 
   if(i + 1 < num_cmd_fd)
     memmove(&cmd_fds[i],&cmd_fds[i+1],(num_cmd_fd - i - 1)*sizeof(mp_input_fd_t));
@@ -546,9 +547,9 @@
 
   cmd_def = &mp_cmds[i];
 
-  cmd = (mp_cmd_t*)malloc(sizeof(mp_cmd_t));
+  cmd = (mp_cmd_t*)mp_malloc(sizeof(mp_cmd_t));
   cmd->id = cmd_def->id;
-  cmd->name = strdup(cmd_def->name);
+  cmd->name = mp_strdup(cmd_def->name);
 
   ptr = str;
 
@@ -605,7 +606,7 @@
 	break;
       } else if(!e) e = ptr+strlen(ptr);
       l = e-start;
-      cmd->args[i].v.s = (char*)malloc((l+1)*sizeof(char));
+      cmd->args[i].v.s = (char*)mp_malloc((l+1)*sizeof(char));
       strncpy(cmd->args[i].v.s,start,l);
       cmd->args[i].v.s[l] = '\0';
       ptr2 = start;
@@ -632,7 +633,7 @@
   for( ; i < MP_CMD_MAX_ARGS && cmd_def->args[i].type != -1 ; i++) {
     memcpy(&cmd->args[i],&cmd_def->args[i],sizeof(mp_cmd_arg_t));
     if(cmd_def->args[i].type == MP_CMD_ARG_STRING && cmd_def->args[i].v.s != NULL)
-      cmd->args[i].v.s = strdup(cmd_def->args[i].v.s);
+      cmd->args[i].v.s = mp_strdup(cmd_def->args[i].v.s);
   }
 
   if(i < MP_CMD_MAX_ARGS)
@@ -664,7 +665,7 @@
 
   // Allocate the buffer if it dont exist
   if(!mp_fd->buffer) {
-    mp_fd->buffer = (char*)malloc(MP_CMD_MAX_SIZE*sizeof(char));
+    mp_fd->buffer = (char*)mp_malloc(MP_CMD_MAX_SIZE*sizeof(char));
     mp_fd->pos = 0;
     mp_fd->size = MP_CMD_MAX_SIZE;
   }
@@ -718,7 +719,7 @@
 
     // Not dropping : put the cmd in ret
     if( ! (mp_fd->flags & MP_FD_DROP)) {
-      (*ret) = (char*)malloc((l+1)*sizeof(char));
+      (*ret) = (char*)mp_malloc((l+1)*sizeof(char));
       strncpy((*ret),mp_fd->buffer,l);
       (*ret)[l] = '\0';
     } else { // Remove the dropping flag
@@ -757,7 +758,7 @@
 
 void
 mp_input_add_cmd_filter(mp_input_cmd_filter func, any_t* ctx) {
-  mp_cmd_filter_t* filter = malloc(sizeof(mp_cmd_filter_t))/*, *prev*/;
+  mp_cmd_filter_t* filter = mp_malloc(sizeof(mp_cmd_filter_t))/*, *prev*/;
 
   filter->filter = func;
   filter->ctx = ctx;
@@ -1089,7 +1090,7 @@
       continue;
     }
     ret = mp_input_parse_cmd(cmd);
-    free(cmd);
+    mp_free(cmd);
     if(!ret)
       continue;
     last_loop = i;
@@ -1129,7 +1130,7 @@
 
 /**
  * \param peek_only when set, the returned command stays in the queue.
- * Do not free the returned cmd whe you set this!
+ * Do not mp_free the returned cmd whe you set this!
  */
 mp_cmd_t*
 mp_input_get_cmd(int time, int paused, int peek_only) {
@@ -1169,13 +1170,13 @@
   if ( !cmd ) return;
 
   if(cmd->name)
-    free(cmd->name);
+    mp_free(cmd->name);
   
   for(i=0; i < MP_CMD_MAX_ARGS && cmd->args[i].type != -1; i++) {
     if(cmd->args[i].type == MP_CMD_ARG_STRING && cmd->args[i].v.s != NULL)
-      free(cmd->args[i].v.s);
+      mp_free(cmd->args[i].v.s);
   }
-  free(cmd);
+  mp_free(cmd);
 }
 
 mp_cmd_t*
@@ -1186,13 +1187,13 @@
   assert(cmd != NULL);
 #endif
 
-  ret = (mp_cmd_t*)malloc(sizeof(mp_cmd_t));
+  ret = (mp_cmd_t*)mp_malloc(sizeof(mp_cmd_t));
   memcpy(ret,cmd,sizeof(mp_cmd_t));
   if(cmd->name)
-    ret->name = strdup(cmd->name);
+    ret->name = mp_strdup(cmd->name);
   for(i = 0;  i < MP_CMD_MAX_ARGS && cmd->args[i].type != -1; i++) {
     if(cmd->args[i].type == MP_CMD_ARG_STRING && cmd->args[i].v.s != NULL)
-      ret->args[i].v.s = strdup(cmd->args[i].v.s);
+      ret->args[i].v.s = mp_strdup(cmd->args[i].v.s);
   }
 
   return ret;
@@ -1286,13 +1287,13 @@
   }
 
   if(!bind) {
-    cmd_binds = (mp_cmd_bind_t*)realloc(cmd_binds,(i+2)*sizeof(mp_cmd_bind_t));
+    cmd_binds = (mp_cmd_bind_t*)mp_realloc(cmd_binds,(i+2)*sizeof(mp_cmd_bind_t));
     memset(&cmd_binds[i],0,2*sizeof(mp_cmd_bind_t));
     bind = &cmd_binds[i];
   }
   if(bind->cmd)
-    free(bind->cmd);
-  bind->cmd = strdup(cmd);
+    mp_free(bind->cmd);
+  bind->cmd = mp_strdup(cmd);
   memcpy(bind->input,keys,(MP_MAX_KEY_DOWN+1)*sizeof(int));
 }
 
@@ -1305,9 +1306,9 @@
     return;
 
   for(i = 0; binds[i].cmd != NULL; i++)
-    free(binds[i].cmd);
+    mp_free(binds[i].cmd);
 
-  free(binds);
+  mp_free(binds);
 
 }
   

Modified: mplayerxp/input/input.h
===================================================================
--- mplayerxp/input/input.h	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/input/input.h	2012-10-29 15:54:02 UTC (rev 251)
@@ -188,7 +188,7 @@
 void
 mp_input_add_cmd_filter(mp_input_cmd_filter, any_t* ctx);
 
-// After getting a command from mp_input_get_cmd you need to free it using this
+// After getting a command from mp_input_get_cmd you need to mp_free it using this
 // function
 void
 mp_cmd_free(mp_cmd_t* cmd);

Modified: mplayerxp/input/lirc.c
===================================================================
--- mplayerxp/input/lirc.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/input/lirc.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -56,7 +56,7 @@
     if(l > 0)
       memmove(cmd_buf,&cmd_buf[w],l+1);
     else {
-      free(cmd_buf);
+      mp_free(cmd_buf);
       cmd_buf = NULL;
     }
     return w;
@@ -89,14 +89,14 @@
     int l = strlen(c);
     if(l <= 0)
       continue;
-    cmd_buf = realloc(cmd_buf,cl+l+2);
+    cmd_buf = mp_realloc(cmd_buf,cl+l+2);
     memcpy(&cmd_buf[cl],c,l);
     cl += l+1;
     cmd_buf[cl-1] = '\n';
     cmd_buf[cl] = '\0';
   }
 
-  free(code);
+  mp_free(code);
 
   if(r < 0)
     return MP_INPUT_DEAD;
@@ -110,7 +110,7 @@
 void
 mp_input_lirc_close(int fd) {
   if(cmd_buf) {
-    free(cmd_buf);
+    mp_free(cmd_buf);
     cmd_buf = NULL;
   }
   lirc_freeconfig(lirc_config);

Modified: mplayerxp/libao2/ao_alsa9.c
===================================================================
--- mplayerxp/libao2/ao_alsa9.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libao2/ao_alsa9.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -17,8 +17,8 @@
 #include <string.h>
 #include <sys/poll.h>
 
-#include "../mp_config.h"
-#include "../mplayer.h"
+#include "mp_config.h"
+#include "mplayer.h"
 #define ALSA_PCM_NEW_HW_PARAMS_API
 #define ALSA_PCM_NEW_SW_PARAMS_API
 #include <alsa/asoundlib.h>
@@ -27,7 +27,8 @@
 #include "audio_out_internal.h"
 #include "afmt.h"
 #include "ao_msg.h"
-#include "../libmpdemux/mrl.h"
+#include "libmpdemux/mrl.h"
+#include "osdep/mplib.h"
 
 static ao_info_t info =
 {
@@ -319,7 +320,7 @@
     char *alsa_port=NULL;
     char alsa_device[ALSA_DEVICE_SIZE];
     UNUSED(flags);
-    ao->priv=malloc(sizeof(priv_t));
+    ao->priv=mp_malloc(sizeof(priv_t));
     priv_t*priv=ao->priv;
     memset(priv,0,sizeof(priv_t));
     priv->first=1;
@@ -632,21 +633,21 @@
     priv_t*priv=ao->priv;
     if(!priv->handler) {
 	MSG_ERR("alsa-uninit: no handler defined!\n");
-	free(priv);
+	mp_free(priv);
 	return;
     }
 
     if (!priv_conf.noblock) {
 	if ((err = snd_pcm_drain(priv->handler)) < 0) {
 	    MSG_ERR("alsa-uninit: pcm drain error: %s\n", snd_strerror(err));
-	    free(priv);
+	    mp_free(priv);
 	    return;
 	}
     }
 
     if ((err = snd_pcm_close(priv->handler)) < 0) {
 	MSG_ERR("alsa-uninit: pcm close error: %s\n", snd_strerror(err));
-	free(priv);
+	mp_free(priv);
 	return;
     } else {
 	priv->handler = NULL;
@@ -654,7 +655,7 @@
     }
     snd_pcm_hw_params_free(priv->hwparams);
     snd_pcm_sw_params_free(priv->swparams);
-    free(priv);
+    mp_free(priv);
 }
 
 static void audio_pause(ao_data_t* ao)
@@ -848,7 +849,7 @@
     int count;
 
     count = snd_pcm_poll_descriptors_count (priv->handler);
-    ufds = malloc(sizeof(struct pollfd) * count);
+    ufds = mp_malloc(sizeof(struct pollfd) * count);
     snd_pcm_poll_descriptors(priv->handler, ufds, count);
 
     //first wait_for_poll
@@ -929,7 +930,7 @@
     if ((int)result < 0) result = 0;
 
 #ifdef USE_POLL
-    free(ufds);
+    mp_free(ufds);
 #endif
 
     return result;
@@ -943,7 +944,7 @@
     GET_SPACE_XRUN,
     GET_SPACE_UNDEFINED
 }space_status;
-/* how many byes are free in the buffer */
+/* how many byes are mp_free in the buffer */
 static unsigned get_space(ao_data_t* ao)
 {
     priv_t*priv=ao->priv;
@@ -1001,7 +1002,7 @@
     }
 
     if (e_status!=GET_SPACE_RUNNING)
-	MSG_V("alsa-space: free space = %i, status=%i, %i --\n", ret, st, e_status);
+	MSG_V("alsa-space: mp_free space = %i, status=%i, %i --\n", ret, st, e_status);
     snd_pcm_status_free(status);
 
     if (ret < 0) {

Modified: mplayerxp/libao2/ao_arts.c
===================================================================
--- mplayerxp/libao2/ao_arts.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libao2/ao_arts.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -5,7 +5,7 @@
  *
  * This file is part of MPlayer.
  *
- * MPlayer is free software; you can redistribute it and/or modify
+ * MPlayer is mp_free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
@@ -30,7 +30,7 @@
 #include "afmt.h"
 #include "ao_msg.h"
 
-/* Feel free to experiment with the following values: */
+/* Feel mp_free to experiment with the following values: */
 #define ARTS_PACKETS 10 /* Number of audio packets */
 #define ARTS_PACKET_SIZE_LOG2 11 /* Log2 of audio packet size */
 

Modified: mplayerxp/libao2/ao_esd.c
===================================================================
--- mplayerxp/libao2/ao_esd.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libao2/ao_esd.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -5,7 +5,7 @@
  *
  * This file is part of MPlayer.
  *
- * MPlayer is free software; you can redistribute it and/or modify
+ * MPlayer is mp_free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
@@ -53,6 +53,7 @@
 #include "postproc/af_format.h"
 #include "afmt.h"
 #include "ao_msg.h"
+#include "osdep/mplib.h"
 
 
 #define ESD_RESAMPLES 0
@@ -162,7 +163,7 @@
  */
 static int init(ao_data_t* ao,unsigned flags)
 {
-    ao->priv=malloc(sizeof(priv_t));
+    ao->priv=mp_malloc(sizeof(priv_t));
     priv_t*priv=ao->priv;
     memset(priv,0,sizeof(priv_t));
     priv->fd=priv->play_fd=-1;
@@ -314,7 +315,7 @@
 	esd_close(priv->fd);
 	priv->fd = -1;
     }
-    free(priv);
+    mp_free(priv);
 }
 
 
@@ -453,7 +454,7 @@
     if (!FD_ISSET(priv->play_fd, &wfds))
 	return 0;
 
-    /* try to fill 50% of the remaining "free" buffer space */
+    /* try to fill 50% of the remaining "mp_free" buffer space */
     space = (ESD_MAX_DELAY - current_delay) * ao->bps * 0.5f;
 
     /* round up to next multiple of ESD_BUF_SIZE */

Modified: mplayerxp/libao2/ao_jack.c
===================================================================
--- mplayerxp/libao2/ao_jack.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libao2/ao_jack.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -6,7 +6,7 @@
  *
  * This file is part of MPlayer.
  *
- * MPlayer is free software; you can redistribute it and/or modify
+ * MPlayer is mp_free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
@@ -33,8 +33,9 @@
 #include "postproc/af_format.h"
 #include "afmt.h"
 #include "osdep/timer.h"
+#include "osdep/mplib.h"
 
-#include "../fifo.h"
+#include "fifo.h"
 #include <jack/jack.h>
 #include "ao_msg.h"
 
@@ -212,7 +213,7 @@
 }
 #endif
 static int init(ao_data_t* ao,unsigned flags) {
-    ao->priv=malloc(sizeof(priv_t));
+    ao->priv=mp_malloc(sizeof(priv_t));
     priv_t*priv=ao->priv;
     memset(priv,0,sizeof(priv_t));
     UNUSED(flags);
@@ -250,7 +251,7 @@
     goto err_out;
   }
   if (!client_name) {
-    client_name = malloc(40);
+    client_name = mp_malloc(40);
     sprintf(client_name, "MPlayerXP [%d]", getpid());
   }
   if (!autostart)
@@ -307,15 +308,15 @@
   ao->bps = channels * rate * sizeof(float);
   ao->buffersize = CHUNK_SIZE * NUM_CHUNKS;
   ao->outburst = CHUNK_SIZE;
-  free(matching_ports);
-  free(port_name);
-  free(client_name);
+  mp_free(matching_ports);
+  mp_free(port_name);
+  mp_free(client_name);
   return 1;
 
 err_out:
-  free(matching_ports);
-  free(port_name);
-  free(client_name);
+  mp_free(matching_ports);
+  mp_free(port_name);
+  mp_free(client_name);
   if (priv->client)
     jack_client_close(priv->client);
   cb_fifo_free(priv->buffer);
@@ -332,7 +333,7 @@
   jack_client_close(priv->client);
   cb_fifo_free(priv->buffer);
   priv->buffer = NULL;
-  free(priv);
+  mp_free(priv);
 }
 
 /**

Modified: mplayerxp/libao2/ao_nas.c
===================================================================
--- mplayerxp/libao2/ao_nas.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libao2/ao_nas.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -13,7 +13,7 @@
  *
  * This file is part of MPlayer.
  *
- * MPlayer is free software; you can redistribute it and/or modify
+ * MPlayer is mp_free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
@@ -58,6 +58,7 @@
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "postproc/af_format.h"
+#include "osdep/mplib.h"
 #include "afmt.h"
 #include "ao_msg.h"
 
@@ -415,7 +416,7 @@
 
 static int init(ao_data_t* ao,unsigned flags)
 {
-    ao->priv=malloc(sizeof(priv_t));
+    ao->priv=mp_malloc(sizeof(priv_t));
     priv_t* priv=ao->priv;
     memset(priv, 0, sizeof(priv_t));
     UNUSED(flags);
@@ -452,9 +453,9 @@
 	ao->buffersize = buffer_size*3;
 
 	priv->client_buffer_size = buffer_size*2;
-	priv->client_buffer = malloc(priv->client_buffer_size);
+	priv->client_buffer = mp_malloc(priv->client_buffer_size);
 	priv->server_buffer_size = buffer_size;
-	priv->server_buffer = malloc(priv->server_buffer_size);
+	priv->server_buffer = mp_malloc(priv->server_buffer_size);
 
 	if (!bytes_per_sample) {
 		MSG_ERR("ao_nas: init(): Zero bytes per sample -> nosound\n");
@@ -531,9 +532,9 @@
 	pthread_join(priv->event_thread, NULL);
 	AuCloseServer(priv->aud);
 	priv->aud = 0;
-	free(priv->client_buffer);
-	free(priv->server_buffer);
-    free(priv);
+	mp_free(priv->client_buffer);
+	mp_free(priv->server_buffer);
+    mp_free(priv);
 }
 
 // stop playing and empty buffers (for seeking/pause)

Modified: mplayerxp/libao2/ao_null.c
===================================================================
--- mplayerxp/libao2/ao_null.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libao2/ao_null.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -7,6 +7,7 @@
 
 #include "mp_config.h"
 #include "osdep/bswap.h"
+#include "osdep/mplib.h"
 
 #include "libmpdemux/mrl.h"
 #include "afmt.h"
@@ -106,7 +107,7 @@
 // open & setup audio device
 // return: 1=success 0=fail
 static int __FASTCALL__ init(ao_data_t* ao,unsigned flags){
-    ao->priv=malloc(sizeof(priv_t));
+    ao->priv=mp_malloc(sizeof(priv_t));
     priv_t*priv = (priv_t*)ao->priv;
     memset(priv,0,sizeof(priv_t));
     char *null_dev=NULL,*mode=NULL;
@@ -186,7 +187,7 @@
 	fwrite(&wavhdr,sizeof(wavhdr),1,priv->fd);
     }
     if(priv->fd) fclose(priv->fd);
-    free(priv);
+    mp_free(priv);
 }
 
 // stop playing and empty priv->buffers (for seeking/pause)

Modified: mplayerxp/libao2/ao_openal.c
===================================================================
--- mplayerxp/libao2/ao_openal.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libao2/ao_openal.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -5,7 +5,7 @@
  *
  * This file is part of MPlayer.
  *
- * MPlayer is free software; you can redistribute it and/or modify
+ * MPlayer is mp_free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
@@ -34,7 +34,7 @@
 #include "postproc/af_format.h"
 #include "afmt.h"
 #include "osdep/timer.h"
-//#include "subopt-helper.h"
+#include "osdep/mplib.h"
 #include "ao_msg.h"
 
 static const ao_info_t info =
@@ -93,7 +93,7 @@
 #endif
 static int init(ao_data_t* ao,unsigned flags)
 {
-    ao->priv=malloc(sizeof(priv_t));
+    ao->priv=mp_malloc(sizeof(priv_t));
     priv_t*priv=ao->priv;
     memset(priv,0,sizeof(priv_t));
   UNUSED(flags);
@@ -157,7 +157,7 @@
   ao->bps = channels * rate * 2;
   ao->buffersize = CHUNK_SIZE * NUM_BUF;
   ao->outburst = channels * CHUNK_SIZE;
-  priv->tmpbuf = malloc(CHUNK_SIZE);
+  priv->tmpbuf = mp_malloc(CHUNK_SIZE);
   return 1;
 
 err_out:
@@ -170,7 +170,7 @@
   ALCcontext *ctx = alcGetCurrentContext();
   ALCdevice *dev = alcGetContextsDevice(ctx);
   priv_t*priv=ao->priv;
-  free(priv->tmpbuf);
+  mp_free(priv->tmpbuf);
   if (!immed) {
     ALint state;
     alGetSourcei(priv->sources[0], AL_SOURCE_STATE, &state);
@@ -183,7 +183,7 @@
   alcMakeContextCurrent(NULL);
   alcDestroyContext(ctx);
   alcCloseDevice(dev);
-  free(ao->priv);
+  mp_free(ao->priv);
 }
 
 static void unqueue_buffers(ao_data_t* ao) {

Modified: mplayerxp/libao2/ao_oss.c
===================================================================
--- mplayerxp/libao2/ao_oss.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libao2/ao_oss.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -10,8 +10,9 @@
 #include <errno.h>
 #include <string.h>
 
-#include "../mp_config.h"
-#include "../mixer.h"
+#include "mp_config.h"
+#include "mixer.h"
+#include "osdep/mplib.h"
 
 #include "afmt.h"
 #include "audio_out.h"
@@ -198,7 +199,7 @@
 static int __FASTCALL__ init(ao_data_t* ao,unsigned flags){
   char *mixer_channels [SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_NAMES;
   UNUSED(flags);
-  ao->priv=malloc(sizeof(priv_t));
+  ao->priv=mp_malloc(sizeof(priv_t));
   priv_t*priv=ao->priv;
   memset(priv,0,sizeof(priv_t));
   priv->dsp=PATH_DEV_DSP;
@@ -309,7 +310,7 @@
           MSG_V("OSS-CONF: %d bytes/frag (GETBLKSIZE)\n",ao->outburst);
       }
   } else {
-      MSG_V("OSS-CONF: frags: %3d/%d  (%d bytes/frag)  free: %6d\n",
+      MSG_V("OSS-CONF: frags: %3d/%d  (%d bytes/frag)  mp_free: %6d\n",
           priv->zz.fragments, priv->zz.fragstotal, priv->zz.fragsize, priv->zz.bytes);
       if(ao->buffersize==0) ao->buffersize=priv->zz.bytes;
       ao->outburst=priv->zz.fragsize;
@@ -320,7 +321,7 @@
     any_t* data;
     ao->buffersize=0;
 #ifdef HAVE_AUDIO_SELECT
-    data=malloc(ao->outburst); memset(data,0,ao->outburst);
+    data=mp_malloc(ao->outburst); memset(data,0,ao->outburst);
     while(ao->buffersize<0x40000){
       fd_set rfds;
       struct timeval tv;
@@ -330,7 +331,7 @@
       write(priv->fd,data,ao->outburst);
       ao->buffersize+=ao->outburst;
     }
-    free(data);
+    mp_free(data);
     if(ao->buffersize==0){
         MSG_ERR("\n   *** OSS-CONF: Your audio driver DOES NOT support select()  ***\n"
           "Recompile mplayerxp with #undef HAVE_AUDIO_SELECT in mp_config.h !\n\n");
@@ -358,7 +359,7 @@
 #endif
     close(priv->fd);
     priv->fd = -1;
-    free(ao->priv);
+    mp_free(ao->priv);
 }
 
 // stop playing and empty buffers (for seeking/pause)

Modified: mplayerxp/libao2/ao_sdl.c
===================================================================
--- mplayerxp/libao2/ao_sdl.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libao2/ao_sdl.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -18,6 +18,7 @@
 #include "afmt.h"
 #include <SDL/SDL.h>
 #include "osdep/fastmemcpy.h"
+#include "osdep/mplib.h"
 #include "ao_msg.h"
 
 static ao_info_t info = 
@@ -98,7 +99,7 @@
 static void setenv(const char *name, const char *val, int _xx)
 {
   int len  = strlen(name) + strlen(val) + 2;
-  char *env = malloc(len);
+  char *env = mp_malloc(len);
 
   if (env != NULL) {
     strcpy(env, name);
@@ -147,12 +148,12 @@
 {
 	unsigned i;
 	UNUSED(flags);
-	ao->priv=malloc(sizeof(priv_t));
+	ao->priv=mp_malloc(sizeof(priv_t));
 	memset(ao->priv,0,sizeof(priv_t));
 	priv_t*priv=ao->priv;
 	priv->volume=127;
 	/* Allocate ring-priv->buffer memory */
-	for(i=0;i<NUM_BUFS;i++) priv->buffer[i]=(unsigned char *) malloc(BUFFSIZE);
+	for(i=0;i<NUM_BUFS;i++) priv->buffer[i]=(unsigned char *) mp_malloc(BUFFSIZE);
 
 	if(ao->subdevice) {
 		setenv("SDL_AUDIODRIVER", ao->subdevice, 1);
@@ -276,7 +277,7 @@
 	MSG_V("SDL: Audio Subsystem shutting down!\n");
 	SDL_CloseAudio();
 	SDL_QuitSubSystem(SDL_INIT_AUDIO);
-	free(ao->priv);
+	mp_free(ao->priv);
 }
 
 // stop playing and empty buffers (for seeking/pause)

Modified: mplayerxp/libao2/ao_wav.c
===================================================================
--- mplayerxp/libao2/ao_wav.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libao2/ao_wav.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -3,7 +3,7 @@
  *
  * This file is part of MPlayerXP.
  *
- * MPlayer is free software; you can redistribute it and/or modify
+ * MPlayer is mp_free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
@@ -31,6 +31,7 @@
 #include "audio_out.h"
 #include "audio_out_internal.h"
 #include "libvo/video_out.h"
+#include "osdep/mplib.h"
 #include "help_mp.h"
 #include "ao_msg.h"
 
@@ -98,7 +99,7 @@
 static int init(ao_data_t* ao,unsigned flags) {
     // set defaults
     UNUSED(flags);
-    ao->priv=malloc(sizeof(priv_t));
+    ao->priv=mp_malloc(sizeof(priv_t));
     priv_t* priv=ao->priv;
     memset(priv,0,sizeof(priv_t));
     priv->pcm_waveheader=1;
@@ -111,7 +112,7 @@
     char str[256];
 
     if(ao->subdevice)	priv->out_filename = ao->subdevice;
-    else		priv->out_filename = strdup("mpxp_adump.wav");
+    else		priv->out_filename = mp_strdup("mpxp_adump.wav");
 
     bits=8;
     switch(format){
@@ -196,8 +197,8 @@
     }
     fclose(priv->fp);
     if (priv->out_filename)
-	free(priv->out_filename);
-    free(priv);
+	mp_free(priv->out_filename);
+    mp_free(priv);
 }
 
 // stop playing and empty buffers (for seeking/pause)

Modified: mplayerxp/libao2/audio_out.c
===================================================================
--- mplayerxp/libao2/audio_out.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libao2/audio_out.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -2,7 +2,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "../mp_config.h"
+#include "mp_config.h"
+#include "osdep/mplib.h"
 #include "audio_out.h"
 #include "afmt.h"
 #include "ao_msg.h"
@@ -206,14 +207,14 @@
 {
     ao_data_t* ao;
     int retval;
-    ao=malloc(sizeof(ao_data_t));
+    ao=mp_malloc(sizeof(ao_data_t));
     memset(ao,0,sizeof(ao_data_t));
-    if(subdevice) ao->subdevice=strdup(subdevice);
+    if(subdevice) ao->subdevice=mp_strdup(subdevice);
     ao->outburst=OUTBURST;
     ao->buffersize=-1;
     retval = audio_out->init(ao,flags);
     if(retval) return ao;
-    free(ao);
+    mp_free(ao);
     return NULL;
 }
 
@@ -227,8 +228,8 @@
 void ao_uninit(ao_data_t*ao)
 {
     audio_out->uninit(ao);
-    if(ao->subdevice) free(ao->subdevice);
-    free(ao);
+    if(ao->subdevice) mp_free(ao->subdevice);
+    mp_free(ao);
     ao=NULL;
 }
 

Modified: mplayerxp/libmpcodecs/ad_a52.c
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libmpcodecs/ad_a52.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -26,6 +26,7 @@
 uint32_t mpxp_a52_flags=0;
 
 #include "osdep/bswap.h"
+#include "osdep/mplib.h"
 
 static const ad_info_t info = 
 {
@@ -128,7 +129,7 @@
   }
   sh->audio_out_minsize=audio_output_channels*sh->samplesize*256*6;
   sh->audio_in_minsize=MAX_AC3_FRAME;
-  sh->context=malloc(sizeof(a52_priv_t));
+  sh->context=mp_malloc(sizeof(a52_priv_t));
   return 1;
 }
 
@@ -190,7 +191,7 @@
 
 void uninit(sh_audio_t *sh)
 {
-  free(sh->context);
+  mp_free(sh->context);
 }
 
 int control(sh_audio_t *sh,int cmd,any_t* arg, ...)

Modified: mplayerxp/libmpcodecs/ad_acm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libmpcodecs/ad_acm.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -7,7 +7,8 @@
 #include "ad_internal.h"
 #include "codecs_ld.h"
 #include "loader/wineacm.h"
-#include "../libmpdemux/aviprint.h"
+#include "libmpdemux/aviprint.h"
+#include "osdep/mplib.h"
 #include "help_mp.h"
 
 static const ad_info_t info =
@@ -50,7 +51,7 @@
     priv->o_wf.cbSize=0;
     if(!in_fmt)
     {
-	in_fmt=sh_audio->wf=malloc(sizeof(WAVEFORMATEX));
+	in_fmt=sh_audio->wf=mp_malloc(sizeof(WAVEFORMATEX));
 	memcpy(in_fmt,&priv->o_wf,sizeof(WAVEFORMATEX));
 	in_fmt->wFormatTag=sh_audio->wtag;
     }
@@ -94,7 +95,7 @@
     sh_audio->samplerate=priv->o_wf.nSamplesPerSec;
     sh_audio->samplesize=(priv->o_wf.wBitsPerSample+7)/8;
     sh_audio->a_in_buffer_size=2*sh_audio->audio_in_minsize;
-    sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size);
+    sh_audio->a_in_buffer=mp_malloc(sh_audio->a_in_buffer_size);
     sh_audio->a_in_buffer_len=0;
 
     return 1;
@@ -142,7 +143,7 @@
 {
   /* Win32 ACM audio codec: */
   acm_priv_t *priv;
-  if(!(sh_audio->context=malloc(sizeof(acm_priv_t)))) return 0;
+  if(!(sh_audio->context=mp_malloc(sizeof(acm_priv_t)))) return 0;
   priv=sh_audio->context;
   if(!init_acm_audio_codec(sh_audio)){
     MSG_ERR(MSGTR_ACMiniterror);
@@ -155,7 +156,7 @@
 void uninit(sh_audio_t *sh)
 {
   close_acm_audio_codec(sh);
-  free(sh->context);
+  mp_free(sh->context);
 }
 
 int control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)

Modified: mplayerxp/libmpcodecs/ad_dca.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libmpcodecs/ad_dca.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -18,6 +18,7 @@
 #include "libao2/afmt.h"
 #include "libao2/audio_out.h"
 #include "postproc/af.h"
+#include "osdep/mplib.h"
 
 #define MAX_AC5_FRAME 4096
 
@@ -128,7 +129,7 @@
     }
     sh->audio_out_minsize=audio_output_channels*sh->samplesize*256*8;
     sh->audio_in_minsize=MAX_AC5_FRAME;
-    sh->context=malloc(sizeof(dca_priv_t));
+    sh->context=mp_malloc(sizeof(dca_priv_t));
     return 1;
 }
 
@@ -189,7 +190,7 @@
 
 void uninit(sh_audio_t *sh)
 {
-  free(sh->context);
+  mp_free(sh->context);
 }
 
 int control(sh_audio_t *sh,int cmd,any_t* arg, ...)

Modified: mplayerxp/libmpcodecs/ad_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libmpcodecs/ad_dmo.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -7,6 +7,7 @@
 
 #include "mp_config.h"
 #include "help_mp.h"
+#include "osdep/mplib.h"
 #include "ad_internal.h"
 #include "ad_msg.h"
 
@@ -46,12 +47,12 @@
   dmo_priv_t*priv;
   int chans=(audio_output_channels==sh_audio->wf->nChannels) ?
       audio_output_channels : (sh_audio->wf->nChannels>=2 ? 2 : 1);
-  if(!(sh_audio->context=malloc(sizeof(dmo_priv_t)))) return 0;
+  if(!(sh_audio->context=mp_malloc(sizeof(dmo_priv_t)))) return 0;
   priv=sh_audio->context;
   if(!(priv->ds_adec=DMO_AudioDecoder_Open(sh_audio->codec->dll_name,&sh_audio->codec->guid,sh_audio->wf,chans)))
   {
     MSG_ERR(MSGTR_MissingDLLcodec,sh_audio->codec->dll_name);
-    free(sh_audio->context);
+    mp_free(sh_audio->context);
     return 0;
   }
     sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
@@ -68,7 +69,7 @@
 {
     dmo_priv_t*priv = sh->context;
     DMO_AudioDecoder_Destroy(priv->ds_adec);
-    free(priv);
+    mp_free(priv);
 }
 
 static int control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)

Modified: mplayerxp/libmpcodecs/ad_dshow.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dshow.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libmpcodecs/ad_dshow.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -5,6 +5,7 @@
 #include "ad_internal.h"
 #include "mp_config.h"
 #include "help_mp.h"
+#include "osdep/mplib.h"
 #include "loader/dshow/DS_AudioDecoder.h"
 #include "codecs_ld.h"
 
@@ -37,12 +38,12 @@
 int preinit(sh_audio_t *sh_audio)
 {
   dshow_priv_t *priv;
-  if(!(sh_audio->context=malloc(sizeof(dshow_priv_t)))) return 0;
+  if(!(sh_audio->context=mp_malloc(sizeof(dshow_priv_t)))) return 0;
   priv=sh_audio->context;
   if(!(priv->ds_adec=DS_AudioDecoder_Open(sh_audio->codec->dll_name,&sh_audio->codec->guid,sh_audio->wf)))
   {
     MSG_ERR(MSGTR_MissingDLLcodec,sh_audio->codec->dll_name);
-    free(sh_audio->context);
+    mp_free(sh_audio->context);
     return 0;
   }
   sh_audio->i_bps=sh_audio->wf->nAvgBytesPerSec;
@@ -59,7 +60,7 @@
 {
   dshow_priv_t* priv = sh->context;
   DS_AudioDecoder_Destroy(priv->ds_adec);
-  free(priv);
+  mp_free(priv);
 }
 
 int control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)

Modified: mplayerxp/libmpcodecs/ad_faad.c
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libmpcodecs/ad_faad.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -18,6 +18,7 @@
 #include "mplayer.h"
 #include "osdep/cpudetect.h"
 #include "osdep/mm_accel.h"
+#include "osdep/mplib.h"
 #include "libao2/afmt.h"
 #include "libao2/audio_out.h"
 #include "postproc/af.h"
@@ -159,7 +160,7 @@
 {
   sh->audio_out_minsize=8192*FAAD_MAX_CHANNELS;
   sh->audio_in_minsize=FAAD_BUFFLEN;
-  if(!(sh->context=malloc(sizeof(faad_priv_t)))) return 0;
+  if(!(sh->context=mp_malloc(sizeof(faad_priv_t)))) return 0;
   return load_dll("libfaad"SLIBSUFFIX);
 }
 
@@ -234,7 +235,7 @@
   if(NeAAC_init < 0) {
     MSG_WARN("FAAD: Failed to initialize the decoder!\n"); // XXX: deal with cleanup!
     NeAACDecClose(NeAAC_hdec);
-    // XXX: free a_in_buffer here or in uninit?
+    // XXX: mp_free a_in_buffer here or in uninit?
     return 0;
   } else {
     NeAAC_conf = NeAACDecGetCurrentConfiguration(NeAAC_hdec);
@@ -264,7 +265,7 @@
 {
   MSG_V("FAAD: Closing decoder!\n");
   NeAACDecClose(NeAAC_hdec);
-  free(sh->context);
+  mp_free(sh->context);
 }
 
 static int control(sh_audio_t *sh,int cmd,any_t* arg, ...)

Modified: mplayerxp/libmpcodecs/ad_ffmp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_ffmp3.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libmpcodecs/ad_ffmp3.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -11,6 +11,7 @@
 #include "mp_config.h"
 #include "help_mp.h"
 #include "osdep/bswap.h"
+#include "osdep/mplib.h"
 
 #define FF_API_OLD_DECODE_AUDIO 1
 #include "libavcodec/avcodec.h"
@@ -70,7 +71,7 @@
 	lavc_context->bits_per_coded_sample = sh_audio->wf->wBitsPerSample;
 	/* alloc extra data */
 	if (sh_audio->wf->cbSize > 0) {
-	    lavc_context->extradata = malloc(sh_audio->wf->cbSize+FF_INPUT_BUFFER_PADDING_SIZE);
+	    lavc_context->extradata = mp_malloc(sh_audio->wf->cbSize+FF_INPUT_BUFFER_PADDING_SIZE);
 	    lavc_context->extradata_size = sh_audio->wf->cbSize;
 	    memcpy(lavc_context->extradata, (char *)sh_audio->wf + sizeof(WAVEFORMATEX),
 		    lavc_context->extradata_size);
@@ -79,7 +80,7 @@
     // for QDM2
     if (sh_audio->codecdata_len && sh_audio->codecdata && !lavc_context->extradata)
     {
-        lavc_context->extradata = malloc(sh_audio->codecdata_len);
+        lavc_context->extradata = mp_malloc(sh_audio->codecdata_len);
         lavc_context->extradata_size = sh_audio->codecdata_len;
         memcpy(lavc_context->extradata, (char *)sh_audio->codecdata,
                lavc_context->extradata_size);
@@ -131,8 +132,8 @@
 {
   AVCodecContext *lavc_context=sh->context;
   avcodec_close(sh->context);
-  if (lavc_context->extradata) free(lavc_context->extradata);
-  free(lavc_context);
+  if (lavc_context->extradata) mp_free(lavc_context->extradata);
+  mp_free(lavc_context);
   acodec_inited=0;
 }
 

Modified: mplayerxp/libmpcodecs/ad_hwac3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libmpcodecs/ad_hwac3.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -187,7 +187,7 @@
   sh_audio->samplerate=ai.samplerate;   // SET by a52_fillbuff()
   sh_audio->samplesize=ai.framesize;
   sh_audio->i_bps=ai.bitrate*(1000/8);  // SET by a52_fillbuff()
-  sh_audio->ac3_frame=malloc(6144);
+  sh_audio->ac3_frame=mp_malloc(6144);
   sh_audio->o_bps=sh_audio->i_bps;  // XXX FIXME!!! XXX
 
    o_bps is calculated from samplesize*channels*samplerate

Modified: mplayerxp/libmpcodecs/ad_libdv.c
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libmpcodecs/ad_libdv.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -6,7 +6,8 @@
 #include <math.h>
 
 #include "mp_config.h"
-#include "../help_mp.h"
+#include "help_mp.h"
+#include "osdep/mplib.h"
 
 #include <libdv/dv.h>
 #include <libdv/dv_types.h>
@@ -58,12 +59,12 @@
   sh->channels=h->nChannels;
   sh->samplerate=h->nSamplesPerSec;
   sh->samplesize=(h->wBitsPerSample+7)/8;
-  priv = malloc(sizeof(libdv_priv_t));
+  priv = mp_malloc(sizeof(libdv_priv_t));
   memset(priv,0,sizeof(libdv_priv_t));
   priv->decoder=init_global_rawdv_decoder();
   sh->context = priv;
   for (i=0; i < 4; i++)
-    priv->audioBuffers[i] = malloc(2*DV_AUDIO_MAX_SAMPLES);
+    priv->audioBuffers[i] = mp_malloc(2*DV_AUDIO_MAX_SAMPLES);
 
   return 1;
 }
@@ -74,7 +75,7 @@
   unsigned i;
   UNUSED(sh_audio);
   for (i=0; i < 4; i++)
-    free(priv->audioBuffers[i]);
+    mp_free(priv->audioBuffers[i]);
 }
 
 static int control(sh_audio_t *sh,int cmd,any_t* arg, ...)

Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libmpcodecs/ad_mp3.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -8,6 +8,7 @@
 #include "osdep/cpudetect.h"
 #include "osdep/mm_accel.h"
 #include "osdep/fastmemcpy.h"
+#include "osdep/mplib.h"
 #include "codecs_ld.h"
 #include "libao2/afmt.h"
 #include "libao2/audio_out.h"
@@ -143,7 +144,7 @@
 	MPG123_ERR_16TO8TABLE,	/**< Unable to allocate memory for 16 to 8 converter table! */
 	MPG123_BAD_PARAM,		/**< Bad parameter id! */
 	MPG123_BAD_BUFFER,		/**< Bad buffer given -- invalid pointer or too small size. */
-	MPG123_OUT_OF_MEM,		/**< Out of memory -- some malloc() failed. */
+	MPG123_OUT_OF_MEM,		/**< Out of memory -- some mp_malloc() failed. */
 	MPG123_NOT_INITIALIZED,	/**< You didn't initialize the library! */
 	MPG123_BAD_DECODER,		/**< Invalid decoder choice. */
 	MPG123_BAD_HANDLE,		/**< Invalid mpg123 handle. */
@@ -272,7 +273,7 @@
   sh->samplesize=4;
   sh->sample_format=AFMT_FLOAT32;
   mpg123_init();
-  priv = malloc(sizeof(mp3_priv_t));
+  priv = mp_malloc(sizeof(mp3_priv_t));
   memset(priv,0,sizeof(mp3_priv_t));
   sh->context = priv;
   priv->mh = mpg123_new(NULL,&err);
@@ -302,7 +303,7 @@
     mpg123_close(priv->mh);
     mpg123_delete(priv->mh);
     mpg123_exit();
-    free(priv);
+    mp_free(priv);
     return 0;
   }
   mpg123_getformat(priv->mh, &rate, &nch, &enc);
@@ -341,7 +342,7 @@
   mpg123_close(priv->mh);
   mpg123_delete(priv->mh);
   mpg123_exit();
-  free(priv);
+  mp_free(priv);
   dlclose(dll_handle);
 }
 

Modified: mplayerxp/libmpcodecs/ad_real.c
===================================================================
--- mplayerxp/libmpcodecs/ad_real.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libmpcodecs/ad_real.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -11,6 +11,7 @@
 #include "ad_internal.h"
 #include "codecs_ld.h"
 #include "ad_msg.h"
+#include "osdep/mplib.h"
 static const ad_info_t info =  {
 	"RealAudio decoder",
 	"realaud",
@@ -27,12 +28,12 @@
 static any_t*handle=NULL;
 
 any_t*__builtin_new(unsigned long size) {
-	return malloc(size);
+	return mp_malloc(size);
 }
 
 /* required for cook's uninit: */
 void __builtin_delete(any_t* ize) {
-	free(ize);
+	mp_free(ize);
 }
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
@@ -77,10 +78,10 @@
   char path[4096];
   char cpath[4096];
   real_priv_t *rpriv;
-  rpriv=sh->context=malloc(sizeof(real_priv_t));
+  rpriv=sh->context=mp_malloc(sizeof(real_priv_t));
   if(!(handle = dlopen (sh->codec->dll_name, RTLD_LAZY)))
   {
-      free(sh->context);
+      mp_free(sh->context);
       return 0;
   }
 
@@ -98,7 +99,7 @@
   if(!raCloseCodec || !raDecode || !raFreeDecoder ||
      !raGetFlavorProperty || !(raOpenCodec2||raOpenCodec) || !raSetFlavor ||
      !raInitDecoder){
-      free(sh->context);
+      mp_free(sh->context);
       return 0;
   }
 
@@ -128,7 +129,7 @@
 	result=raOpenCodec(&rpriv->internal);
     if(result){
       MSG_WARN("Decoder open failed, error code: 0x%X\n",result);
-      free(sh->context);
+      mp_free(sh->context);
       return 0;
     }
 
@@ -150,7 +151,7 @@
     result=raInitDecoder(rpriv->internal,&init_data);
     if(result){
       MSG_WARN("Decoder init failed, error code: 0x%X\n",result);
-      free(sh->context);
+      mp_free(sh->context);
       return 0;
     }
   }
@@ -163,7 +164,7 @@
     result=raSetFlavor(rpriv->internal,((short*)(sh->wf+1))[2]);
     if(result){
       MSG_WARN("Decoder flavor setup failed, error code: 0x%X\n",result);
-      free(sh->context);
+      mp_free(sh->context);
       return 0;
     }
 
@@ -198,7 +199,7 @@
   real_priv_t *rpriv = sh->context;
   if (raFreeDecoder) raFreeDecoder(rpriv->internal);
   if (raCloseCodec) raCloseCodec(rpriv->internal);
-  free(sh->context);
+  mp_free(sh->context);
 }
 
 static const unsigned char sipr_swaps[38][2]={

Modified: mplayerxp/libmpcodecs/ad_twin.c
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libmpcodecs/ad_twin.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -7,8 +7,9 @@
 #include "codecs_ld.h"
 #include "loader/ldt_keeper.h"
 #include "loader/wine/windef.h"
-#include "../libao2/afmt.h"
-#include "../libmpdemux/aviprint.h"
+#include "libao2/afmt.h"
+#include "libmpdemux/aviprint.h"
+#include "osdep/mplib.h"
 
 #include "help_mp.h"
 
@@ -304,7 +305,7 @@
     priv->framesize=TvqGetFrameSize();
     sh_audio->audio_in_minsize=priv->framesize*in_fmt->nChannels;
     sh_audio->a_in_buffer_size=4*sh_audio->audio_in_minsize;
-    sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size);
+    sh_audio->a_in_buffer=mp_malloc(sh_audio->a_in_buffer_size);
     sh_audio->a_in_buffer_len=0;
 
 
@@ -328,7 +329,7 @@
 {
   /* Win32 VQF audio codec: */
   vqf_priv_t *priv;
-  if(!(sh_audio->context=malloc(sizeof(vqf_priv_t)))) return 0;
+  if(!(sh_audio->context=mp_malloc(sizeof(vqf_priv_t)))) return 0;
   priv=sh_audio->context;
   if(!load_dll((const char *)sh_audio->codec->dll_name))
   {
@@ -346,7 +347,7 @@
 void uninit(sh_audio_t *sh)
 {
   close_vqf_audio_codec(sh);
-  free(sh->context);
+  mp_free(sh->context);
   FreeLibrary(vqf_dll);
 }
 

Modified: mplayerxp/libmpcodecs/ad_vorbis.c
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libmpcodecs/ad_vorbis.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -7,6 +7,7 @@
 #include "ad_internal.h"
 #include "libao2/afmt.h"
 #include "libao2/audio_out.h"
+#include "osdep/mplib.h"
 
 extern ao_data_t* ao_data;
 
@@ -38,7 +39,7 @@
 
 static int preinit(sh_audio_t *sh)
 {
-  if(!(sh->context=malloc(sizeof(ov_struct_t)))) return 0;
+  if(!(sh->context=mp_malloc(sizeof(ov_struct_t)))) return 0;
   sh->audio_out_minsize=1024*4; // 1024 samples/frame
   return 1;
 }
@@ -59,7 +60,7 @@
   /// Header
   if(vorbis_synthesis_headerin(&ov->vi,&vc,&op) <0) {
     MSG_ERR("OggVorbis: initial (identification) header broken!\n");
-    free(ov);
+    mp_free(ov);
     return 0;
   }
   op.bytes = ds_get_packet_r(sh->ds,&op.packet,&pts);
@@ -67,14 +68,14 @@
   /// Comments
   if(vorbis_synthesis_headerin(&ov->vi,&vc,&op) <0) {
     MSG_ERR("OggVorbis: comment header broken!\n");
-    free(ov);
+    mp_free(ov);
     return 0;
   }
   op.bytes = ds_get_packet_r(sh->ds,&op.packet,&pts);
   //// Codebook
   if(vorbis_synthesis_headerin(&ov->vi,&vc,&op)<0) {
     MSG_WARN("OggVorbis: codebook header broken!\n");
-    free(ov);
+    mp_free(ov);
     return 0;
   } else { /// Print the infos
     char **ptr=vc.user_comments;
@@ -120,7 +121,7 @@
 
 static void uninit(sh_audio_t *sh)
 {
-  free(sh->context);
+  mp_free(sh->context);
 }
 
 static int control(sh_audio_t *sh,int cmd,any_t* arg, ...)

Modified: mplayerxp/libmpcodecs/dec_audio.c
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.c	2012-10-29 15:28:48 UTC (rev 250)
+++ mplayerxp/libmpcodecs/dec_audio.c	2012-10-29 15:54:02 UTC (rev 251)
@@ -20,6 +20,7 @@
 #include "libmpdemux/demuxer_r.h"
 #include "postproc/af.h"
 #include "osdep/fastmemcpy.h"
+#include "osdep/mplib.h"
 #include "ad_msg.h"
 
 #ifdef USE_FAKE_MONO
@@ -75,7 +76,7 @@
       sh_audio->a_in_buffer_size=sh_audio->audio_in_minsize;
       MSG_V("dec_audio: Allocating %d bytes for input buffer\n",
           sh_audio->a_in_buffer_size);
-      sh_audio->a_in_buffer=malloc(sh_audio->a_in_buffer_size);
+      sh_audio->a_in_buffer=mp_malloc(sh_audio->a_in_buffer_size);
       memset(sh_audio->a_in_buffer,0,sh_audio->a_in_buffer_size);
       sh_audio->a_in_buffer_len=0;
   }
@@ -86,7 +87,7 @@
   MSG_V("dec_audio: Allocating %d + %d = %d bytes for output buffer\n",
       sh_audio->audio_out_minsize,MAX_OUTBURST,sh_audio->a_buffer_size);
 
-  sh_audio->a_buffer=malloc(sh_audio->a_buffer_size);
+  sh_audio->a_buffer=mp_malloc(sh_audio->a_buffer_size);
   if(!sh_audio->a_buffer){
       MSG_ERR(MSGTR_CantAllocAudioBuf);
       return 0;
@@ -96,7 +97,7 @@
 
   if(!mpadec->init(sh_audio)){
       MSG_WARN(MSGTR_CODEC_CANT_INITA);
-      mpca_uninit(sh_audio); /* free buffers */
+      mpca_uninit(sh_audio); /* mp_free buffers */
       return 0;
   }
 
@@ -104,7 +105,7 @@
 
   if(!sh_audio->channels || !sh_audio->samplerate){
     MSG_WARN(MSGTR_UnknownAudio);
-    mpca_uninit(sh_audio); /* free buffers */
+    mpca_uninit(sh_audio); /* mp_free buffers */
     return 0;
   }
 
@@ -138,17 +139,17 @@
     if(sh_audio->afilter){
 	MSG_V("Uninit audio filters...\n");
 	af_uninit(sh_audio->afilter);
-	free(sh_audio->afilter);
+	mp_free(sh_audio->afilter);
 	sh_audio->afilter=NULL;
     }
-    if(sh_audio->a_buffer) free(sh_audio->a_buffer);
+    if(sh_audio->a_buffer) mp_free(sh_audio->a_buffer);
     sh_audio->a_buffer=NULL;
-    if(sh_audio->a_in_buffer) free(sh_audio->a_in_buffer);
+    if(sh_audio->a_in_buffer) mp_free(sh_audio->a_in_buffer);
     sh_audio->a_in_buffer=NULL;
     if(!sh_audio->inited) return;
     MSG_V("uninit audio: %s\n",sh_audio->codec->driver_name);
     mpadec->uninit(sh_audio);
-    if(sh_audio->a_buffer) free(sh_audio->a_buffer);
+    if(sh_audio->a_buffer) mp_free(sh_audio->a_buffer);
     sh_audio->a_buffer=NULL;
     sh_audio->inited=0;
 }
@@ -182,7 +183,7 @@
 
   // let's autoprobe it!
   if(0 != af_init(afs,0)){
-    free(afs);
+    mp_free(afs);
     return 0; // failed :(
   }
 
@@ -228,7 +229,7 @@
   // let's autoprobe it!
   if(0 != af_init(afs,1)){
     sh_audio->afilter=NULL;
-    free(afs);
+    mp_free(afs);
     return 0; // failed :(
   }
 ...
 
[truncated message content]