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

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

Revision: 166
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=166&view=rev
Author:   nickols_k
Date:     2012-10-17 11:27:01 +0000 (Wed, 17 Oct 2012)
Log Message:
-----------
since mplayerxp became the victim of some religious wars: rename void* -> any_t*

Modified Paths:
--------------
    mplayerxp/asxparser.c
    mplayerxp/asxparser.h
    mplayerxp/cfg-mplayer.h
    mplayerxp/cfgparser.c
    mplayerxp/cfgparser.h
    mplayerxp/configure
    mplayerxp/dec_ahead.c
    mplayerxp/fifo.c
    mplayerxp/fifo.h
    mplayerxp/input/input.c
    mplayerxp/input/input.h
    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/libao2/audio_out.h
    mplayerxp/libao2/audio_out_internal.h
    mplayerxp/libmpcodecs/ad.h
    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_dvdpcm.c
    mplayerxp/libmpcodecs/ad_faad.c
    mplayerxp/libmpcodecs/ad_ffmp3.c
    mplayerxp/libmpcodecs/ad_hwac3.c
    mplayerxp/libmpcodecs/ad_internal.h
    mplayerxp/libmpcodecs/ad_libdv.c
    mplayerxp/libmpcodecs/ad_mp3.c
    mplayerxp/libmpcodecs/ad_null.c
    mplayerxp/libmpcodecs/ad_pcm.c
    mplayerxp/libmpcodecs/ad_qtaudio.c
    mplayerxp/libmpcodecs/ad_real.c
    mplayerxp/libmpcodecs/ad_twin.c
    mplayerxp/libmpcodecs/ad_vorbis.c
    mplayerxp/libmpcodecs/codecs_ld.c
    mplayerxp/libmpcodecs/codecs_ld.h
    mplayerxp/libmpcodecs/dec_audio.c
    mplayerxp/libmpcodecs/dec_video.c
    mplayerxp/libmpcodecs/liba52/a52.h
    mplayerxp/libmpcodecs/liba52/a52_internal.h
    mplayerxp/libmpcodecs/liba52/parse.c
    mplayerxp/libmpcodecs/liba52/resample.c
    mplayerxp/libmpcodecs/liba52/resample_c.c
    mplayerxp/libmpcodecs/liba52/resample_mmx.c
    mplayerxp/libmpcodecs/libdca/dca.h
    mplayerxp/libmpcodecs/libdca/dca_internal.h
    mplayerxp/libmpcodecs/libdca/parse.c
    mplayerxp/libmpcodecs/libdca/resample.c
    mplayerxp/libmpcodecs/libdca/resample_c.c
    mplayerxp/libmpcodecs/libdca/resample_mmx.c
    mplayerxp/libmpcodecs/libnuppelvideo/minilzo.c
    mplayerxp/libmpcodecs/vd.c
    mplayerxp/libmpcodecs/vd.h
    mplayerxp/libmpcodecs/vd_divx4.c
    mplayerxp/libmpcodecs/vd_dmo.c
    mplayerxp/libmpcodecs/vd_dshow.c
    mplayerxp/libmpcodecs/vd_ffmpeg.c
    mplayerxp/libmpcodecs/vd_huffyuv.c
    mplayerxp/libmpcodecs/vd_internal.h
    mplayerxp/libmpcodecs/vd_libdv.c
    mplayerxp/libmpcodecs/vd_libmpeg2.c
    mplayerxp/libmpcodecs/vd_mpegpes.c
    mplayerxp/libmpcodecs/vd_null.c
    mplayerxp/libmpcodecs/vd_nuv.c
    mplayerxp/libmpcodecs/vd_qtvideo.c
    mplayerxp/libmpcodecs/vd_raw.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/libmpdemux/asf_streaming.c
    mplayerxp/libmpdemux/cache2.c
    mplayerxp/libmpdemux/cdd.h
    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_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_rawvideo.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/dvdauth.c
    mplayerxp/libmpdemux/freesdp/common.c
    mplayerxp/libmpdemux/freesdp/common.h
    mplayerxp/libmpdemux/freesdp/parser.c
    mplayerxp/libmpdemux/http.c
    mplayerxp/libmpdemux/http.h
    mplayerxp/libmpdemux/librtsp/rtsp.c
    mplayerxp/libmpdemux/mrl.h
    mplayerxp/libmpdemux/mux_lavf.c
    mplayerxp/libmpdemux/mux_mpxp64.c
    mplayerxp/libmpdemux/muxer.h
    mplayerxp/libmpdemux/network.c
    mplayerxp/libmpdemux/network.h
    mplayerxp/libmpdemux/pnm.c
    mplayerxp/libmpdemux/realrtsp/xbuffer.c
    mplayerxp/libmpdemux/realrtsp/xbuffer.h
    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_udp.c
    mplayerxp/libmpdemux/s_vcdnav.c
    mplayerxp/libmpdemux/stheader.h
    mplayerxp/libmpdemux/stream.c
    mplayerxp/libmpdemux/stream.h
    mplayerxp/libmpdemux/tcp.c
    mplayerxp/libmpdemux/tv.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/video.c
    mplayerxp/libmpdemux/yuv4mpeg.c
    mplayerxp/libvo/aclib.c
    mplayerxp/libvo/aclib_template.c
    mplayerxp/libvo/dri_vo.h
    mplayerxp/libvo/fastmemcpy.h
    mplayerxp/libvo/img_format.h
    mplayerxp/libvo/osd_template.c
    mplayerxp/libvo/sub.h
    mplayerxp/libvo/video_out.c
    mplayerxp/libvo/video_out.h
    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/vosub_vidix.h
    mplayerxp/loader/com.h
    mplayerxp/loader/dmo/DMO_AudioDecoder.c
    mplayerxp/loader/dmo/DMO_AudioDecoder.h
    mplayerxp/loader/dmo/DMO_Filter.h
    mplayerxp/loader/dmo/DMO_VideoDecoder.c
    mplayerxp/loader/dmo/DMO_VideoDecoder.h
    mplayerxp/loader/dmo/buffer.c
    mplayerxp/loader/dmo/dmo.c
    mplayerxp/loader/driver.c
    mplayerxp/loader/dshow/DS_AudioDecoder.c
    mplayerxp/loader/dshow/DS_AudioDecoder.h
    mplayerxp/loader/dshow/DS_Filter.c
    mplayerxp/loader/dshow/DS_VideoDecoder.c
    mplayerxp/loader/dshow/DS_VideoDecoder.h
    mplayerxp/loader/dshow/allocator.c
    mplayerxp/loader/dshow/cmediasample.c
    mplayerxp/loader/dshow/inputpin.c
    mplayerxp/loader/dshow/interfaces.h
    mplayerxp/loader/dshow/iunk.h
    mplayerxp/loader/dshow/outputpin.c
    mplayerxp/loader/dshow/outputpin.h
    mplayerxp/loader/elfdll.c
    mplayerxp/loader/ext.c
    mplayerxp/loader/ldt_keeper.c
    mplayerxp/loader/ldt_keeper.h
    mplayerxp/loader/module.c
    mplayerxp/loader/pe_image.c
    mplayerxp/loader/qtx/qtxsdk/components.h
    mplayerxp/loader/registry.c
    mplayerxp/loader/registry.h
    mplayerxp/loader/vfl.c
    mplayerxp/loader/win32.c
    mplayerxp/loader/win32.h
    mplayerxp/loader/wine/windef.h
    mplayerxp/loader/wrapper.h
    mplayerxp/m_option.c
    mplayerxp/m_option.h
    mplayerxp/m_property.c
    mplayerxp/m_property.h
    mplayerxp/m_struct.c
    mplayerxp/m_struct.h
    mplayerxp/mp_image.h
    mplayerxp/mplayer.c
    mplayerxp/my_malloc.c
    mplayerxp/my_malloc.h
    mplayerxp/osdep/lrmi.c
    mplayerxp/osdep/lrmi.h
    mplayerxp/osdep/shmem.c
    mplayerxp/osdep/shmem.h
    mplayerxp/osdep/vbelib.c
    mplayerxp/osdep/vbelib.h
    mplayerxp/postproc/af.c
    mplayerxp/postproc/af.h
    mplayerxp/postproc/af_ao2.c
    mplayerxp/postproc/af_center.c
    mplayerxp/postproc/af_channels.c
    mplayerxp/postproc/af_comp.c
    mplayerxp/postproc/af_control.h
    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_format_alaw.c
    mplayerxp/postproc/af_format_ulaw.c
    mplayerxp/postproc/af_gate.c
    mplayerxp/postproc/af_hrtf.c
    mplayerxp/postproc/af_karaoke.c
    mplayerxp/postproc/af_lp.c
    mplayerxp/postproc/af_mp.c
    mplayerxp/postproc/af_mp.h
    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/dsp.c
    mplayerxp/postproc/dsp.h
    mplayerxp/postproc/dsp_accel.h
    mplayerxp/postproc/libmenu/menu.c
    mplayerxp/postproc/libmenu/menu_console.c
    mplayerxp/postproc/libmenu/menu_filesel.c
    mplayerxp/postproc/vf.c
    mplayerxp/postproc/vf.h
    mplayerxp/postproc/vf_1bpp.c
    mplayerxp/postproc/vf_2xsai.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_format.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/postproc/vf_yuy2.c
    mplayerxp/postproc/vf_yvu9.c
    mplayerxp/pvector/mmx2c.h
    mplayerxp/pvector/pvector.h
    mplayerxp/pvector/pvector_f32_x86.h
    mplayerxp/pvector/pvector_int_x86.h
    mplayerxp/sig_hand.c
    mplayerxp/spudec.c
    mplayerxp/spudec.h
    mplayerxp/subopt-helper.h
    mplayerxp/subreader.c
    mplayerxp/vobsub.c
    mplayerxp/vobsub.h

Modified: mplayerxp/asxparser.c
===================================================================
--- mplayerxp/asxparser.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/asxparser.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -15,24 +15,24 @@
 
 ////// List utils
 
-static void __FASTCALL__ asx_list_add(void* list_ptr,void* entry){
-  void** list = *(void***)list_ptr;
+static void __FASTCALL__ asx_list_add(any_t* list_ptr,any_t* entry){
+  any_t** list = *(any_t***)list_ptr;
   int c = 0;
 
   if(list != NULL)
     for( ; list[c] != NULL; c++) ;
 
-  list = (void*)realloc(list,sizeof(void*)*(c+2));
+  list = (any_t*)realloc(list,sizeof(any_t*)*(c+2));
 
   list[c] = entry;
   list[c+1] = NULL;
 
-  *(void***)list_ptr = list;
+  *(any_t***)list_ptr = list;
 }
 
 
-static void __FASTCALL__ asx_list_remove(void* list_ptr,void* entry,ASX_FreeFunc free_func) {
-  void** list = *(void***)list_ptr;
+static void __FASTCALL__ asx_list_remove(any_t* list_ptr,any_t* entry,ASX_FreeFunc free_func) {
+  any_t** list = *(any_t***)list_ptr;
   int c,e = -1;
 
   if(list == NULL) return;
@@ -47,28 +47,28 @@
   
   if(c == 1) { // Only one entry, we drop all
     free(list);
-    *(void**)list_ptr = NULL;
+    *(any_t**)list_ptr = NULL;
     return;
   }
 
   if(c > e) // If c==e the memmove is not needed
-    memmove(list+e,list+e+1,(c-e)*sizeof(void*));
+    memmove(list+e,list+e+1,(c-e)*sizeof(any_t*));
 
-  list = (void*)realloc(list,(c-1)*sizeof(void*));
+  list = (any_t*)realloc(list,(c-1)*sizeof(any_t*));
   list[c-1] = NULL;
   
-  *(void***)list_ptr = list;
+  *(any_t***)list_ptr = list;
 }
 
-void __FASTCALL__ asx_list_free(void* list_ptr,ASX_FreeFunc free_func) {
-  void** ptr = *(void***)list_ptr;
+void __FASTCALL__ asx_list_free(any_t* list_ptr,ASX_FreeFunc free_func) {
+  any_t** ptr = *(any_t***)list_ptr;
   if(ptr == NULL) return;
   if(free_func != NULL) {
     for( ; *ptr != NULL ; ptr++)
       free_func(*ptr);
   }
-  free(*(void**)list_ptr);
-  *(void**)list_ptr = NULL;
+  free(*(any_t**)list_ptr);
+  *(any_t**)list_ptr = NULL;
 }
 
 /////// Attribs utils

Modified: mplayerxp/asxparser.h
===================================================================
--- mplayerxp/asxparser.h	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/asxparser.h	2012-10-17 11:27:01 UTC (rev 166)
@@ -42,8 +42,8 @@
 
 ////// List utils
 
-typedef void (* __FASTCALL__ ASX_FreeFunc)(void* arg);
+typedef void (* __FASTCALL__ ASX_FreeFunc)(any_t* arg);
 
-extern void __FASTCALL__ asx_list_free(void* list_ptr,ASX_FreeFunc free_func);
+extern void __FASTCALL__ asx_list_free(any_t* list_ptr,ASX_FreeFunc free_func);
 
 #endif

Modified: mplayerxp/cfg-mplayer.h
===================================================================
--- mplayerxp/cfg-mplayer.h	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/cfg-mplayer.h	2012-10-17 11:27:01 UTC (rev 166)
@@ -75,7 +75,7 @@
 extern int audio_output_channels;
 
 extern int sws_flags;
-extern int readPPOpt(void *conf, char *arg);
+extern int readPPOpt(any_t*conf, char *arg);
 extern char *npp_options;
 
 extern int shuffle_playback;

Modified: mplayerxp/cfgparser.c
===================================================================
--- mplayerxp/cfgparser.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/cfgparser.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -261,9 +261,9 @@
   return config;
 }
 
-static void m_config_add_dynamic(m_config_t *conf,void *ptr) {
-    if(!conf->dynasize) conf->dynamics = malloc(sizeof(void *));
-    else		conf->dynamics = realloc(conf->dynamics,(conf->dynasize+1)*sizeof(void *));
+static void m_config_add_dynamic(m_config_t *conf,any_t*ptr) {
+    if(!conf->dynasize) conf->dynamics = malloc(sizeof(any_t*));
+    else		conf->dynamics = realloc(conf->dynamics,(conf->dynasize+1)*sizeof(any_t*));
     conf->dynamics[conf->dynasize] = ptr;
     conf->dynasize++;
 }
@@ -1111,7 +1111,7 @@
   return m_config_find_option(conf_list,arg);
 }
 
-void* m_config_get_option_ptr(m_config_t const*config,const char* arg) {
+any_t* m_config_get_option_ptr(m_config_t const*config,const char* arg) {
   config_t* conf;
 
 #ifdef MP_DEBUG

Modified: mplayerxp/cfgparser.h
===================================================================
--- mplayerxp/cfgparser.h	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/cfgparser.h	2012-10-17 11:27:01 UTC (rev 166)
@@ -42,7 +42,7 @@
 
 struct config {
 	const char *name;
-	void * const p;
+	any_t* const p;
 	unsigned int type;
 	unsigned int flags;
 	float min,max;
@@ -55,7 +55,7 @@
 struct m_config {
   const config_t** opt_list;
   config_save_t** config_stack;
-  void **dynamics;
+  any_t**dynamics;
   unsigned dynasize;
   int cs_level;
   int parser_mode;  /* COMMAND_LINE or CONFIG_FILE */
@@ -72,7 +72,7 @@
   union {
     int as_int;
     float as_float;
-    void* as_pointer;
+    any_t* as_pointer;
   } param;
   char* opt_name;
 };
@@ -128,7 +128,7 @@
 /** Get the p field of the struct defining an option
   * @return NULL on error
 **/
-void* m_config_get_option_ptr(m_config_t const *config,const char* arg);
+any_t* m_config_get_option_ptr(m_config_t const *config,const char* arg);
 
 /** Tell is an option is alredy set or not
   * @return -1 one error (requested option arg exist) otherwise 0 or 1

Modified: mplayerxp/configure
===================================================================
--- mplayerxp/configure	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/configure	2012-10-17 11:27:01 UTC (rev 166)
@@ -897,8 +897,10 @@
 #endif
 #endif
 
+typedef void any_t;
+
 /* Removes warning about unused arguments */
-# define UNUSED(x) ((void)(x))
+# define UNUSED(x) ((any_t)(x))
 
 #endif /* MPXP_CONFIG_H */
 EOF

Modified: mplayerxp/dec_ahead.c
===================================================================
--- mplayerxp/dec_ahead.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/dec_ahead.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -116,7 +116,7 @@
 extern int get_len_audio_buffer(void);
 extern int get_free_audio_buffer(void);
 
-void * audio_play_routine( void * arg );
+any_t* audio_play_routine( any_t* arg );
 
 static volatile int pthread_is_living=0;
 static volatile int a_pthread_is_living=0;
@@ -127,7 +127,7 @@
 
 int xp_is_bad_pts=0;
 /* this routine decodes video+audio but intends to be video only  */
-void * Va_dec_ahead_routine( void * arg )
+any_t* Va_dec_ahead_routine( any_t* arg )
 {
     float duration=0;
     float drop_barrier;
@@ -470,7 +470,7 @@
 }
 
 /* this routine decodes audio only */
-void * a_dec_ahead_routine( void * arg )
+any_t* a_dec_ahead_routine( any_t* arg )
 {
     int xp_id;
     int ret, retval;
@@ -793,7 +793,7 @@
 #define NOTHING_PLAYED (-1.0)
 #define XP_MIN_TIMESLICE 0.010 /* under Linux on x86 min time_slice = 10 ms */
 
-void * audio_play_routine( void * arg )
+any_t* audio_play_routine( any_t* arg )
 {
     int xp_id;
     int eof = 0;

Modified: mplayerxp/fifo.c
===================================================================
--- mplayerxp/fifo.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/fifo.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -111,7 +111,7 @@
     return 0;
 }
 
-int cb_fifo_generic_write(CBFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int))
+int cb_fifo_generic_write(CBFifoBuffer *f, any_t*src, int size, int (*func)(any_t*, any_t*, int))
 {
     int total = size;
     do {
@@ -133,7 +133,7 @@
     return total - size;
 }
 
-int cb_fifo_generic_read(CBFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int))
+int cb_fifo_generic_read(CBFifoBuffer *f, any_t*dest, int buf_size, void (*func)(any_t*, any_t*, int))
 {
 // Read memory barrier needed for SMP here in theory
     do {

Modified: mplayerxp/fifo.h
===================================================================
--- mplayerxp/fifo.h	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/fifo.h	2012-10-17 11:27:01 UTC (rev 166)
@@ -82,7 +82,7 @@
  * @param *func generic read function
  * @param *dest data destination
  */
-int cb_fifo_generic_read(CBFifoBuffer *f, void *dest, int buf_size, void (*func)(void*, void*, int));
+int cb_fifo_generic_read(CBFifoBuffer *f, any_t*dest, int buf_size, void (*func)(any_t*, any_t*, int));
 
 /**
  * Feeds data from a user-supplied callback to an CBFifoBuffer.
@@ -96,7 +96,7 @@
  * If func is NULL, src is interpreted as a simple byte array for source data.
  * @return the number of bytes written to the FIFO
  */
-int cb_fifo_generic_write(CBFifoBuffer *f, void *src, int size, int (*func)(void*, void*, int));
+int cb_fifo_generic_write(CBFifoBuffer *f, any_t*src, int size, int (*func)(any_t*, any_t*, int));
 
 /**
  * Resizes an CBFifoBuffer.

Modified: mplayerxp/input/input.c
===================================================================
--- mplayerxp/input/input.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/input/input.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -356,7 +356,7 @@
 
 typedef struct mp_input_fd {
   int fd;
-  void* read_func;
+  any_t* read_func;
   mp_close_func_t close_func;
   int flags;
   // This fields are for the cmd fds
@@ -368,7 +368,7 @@
 
 struct mp_cmd_filter_st {
   mp_input_cmd_filter filter;
-  void* ctx;
+  any_t* ctx;
   mp_cmd_filter_t* next;
 };
 
@@ -762,7 +762,7 @@
 
 
 void
-mp_input_add_cmd_filter(mp_input_cmd_filter func, void* ctx) {
+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*/;
 
   filter->filter = func;

Modified: mplayerxp/input/input.h
===================================================================
--- mplayerxp/input/input.h	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/input/input.h	2012-10-17 11:27:01 UTC (rev 166)
@@ -105,7 +105,7 @@
   int i;
   float f;
   char* s;
-  void* v;
+  any_t* v;
 } mp_cmd_arg_value_t;
 
 typedef struct mp_cmd_arg {
@@ -144,7 +144,7 @@
 // Set this to grab all incoming key code 
 extern void (*mp_input_key_cb)(int code);
 // Should return 1 if the command was processed
-typedef int (*mp_input_cmd_filter)(mp_cmd_t* cmd, int paused, void* ctx);
+typedef int (*mp_input_cmd_filter)(mp_cmd_t* cmd, int paused, any_t* ctx);
 
 // This function add a new key driver.
 // The first arg is a file descriptor (use a negative value if you don't use any fd)
@@ -186,7 +186,7 @@
 /// These filter allow you to process the command before mplayer
 /// If a filter return a true value mp_input_get_cmd will return NULL
 void
-mp_input_add_cmd_filter(mp_input_cmd_filter, void* ctx);
+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
 // function

Modified: mplayerxp/libao2/ao_alsa9.c
===================================================================
--- mplayerxp/libao2/ao_alsa9.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libao2/ao_alsa9.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -744,10 +744,10 @@
     return 1; /* ok, data should be accepted again */
 }
 
-static unsigned __FASTCALL__ play_normal(void* data, unsigned len);
-static unsigned __FASTCALL__ play_mmap(void* data, unsigned len);
+static unsigned __FASTCALL__ play_normal(any_t* data, unsigned len);
+static unsigned __FASTCALL__ play_mmap(any_t* data, unsigned len);
 
-static unsigned __FASTCALL__ play(void* data, unsigned len, unsigned flags)
+static unsigned __FASTCALL__ play(any_t* data, unsigned len, unsigned flags)
 {
     unsigned result;
     UNUSED(flags);
@@ -764,7 +764,7 @@
     thanxs for marius <ma...@ro...> for giving us the light ;)
 */
 
-static unsigned __FASTCALL__ play_normal(void* data, unsigned len)
+static unsigned __FASTCALL__ play_normal(any_t* data, unsigned len)
 {
     //alsa.bytes_per_sample is always 4 for 2 chn S16_LE
     unsigned num_frames = len / alsa.bytes_per_sample;
@@ -779,7 +779,7 @@
     }
 
     while (num_frames > 0) {
-	res = snd_pcm_writei(alsa.handler, (void *)output_samples, num_frames);
+	res = snd_pcm_writei(alsa.handler, (any_t*)output_samples, num_frames);
 	if (res == -EAGAIN) {
 	    snd_pcm_wait(alsa.handler, 1000);
 	} else if (res == -EPIPE) { /* underrun */
@@ -817,12 +817,12 @@
  * 'An overview of the ALSA API' http://people.debian.org/~joshua/x66.html
  * and some help by Paul Davis <pb...@op...> */
 
-static unsigned __FASTCALL__ play_mmap(void* data, unsigned len)
+static unsigned __FASTCALL__ play_mmap(any_t* data, unsigned len)
 {
     snd_pcm_sframes_t commitres, frames_available;
     snd_pcm_uframes_t frames_transmit, size, offset;
     const snd_pcm_channel_area_t *area;
-    void *outbuffer;
+    any_t*outbuffer;
     unsigned result;
 
 #ifdef USE_POLL //seems not really be needed

Modified: mplayerxp/libao2/ao_arts.c
===================================================================
--- mplayerxp/libao2/ao_arts.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libao2/ao_arts.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -139,7 +139,7 @@
 	arts_free();
 }
 
-static unsigned play(void* data,unsigned len,unsigned flags)
+static unsigned play(any_t* data,unsigned len,unsigned flags)
 {
     UNUSED(flags);
     return arts_write(stream, data, len);

Modified: mplayerxp/libao2/ao_esd.c
===================================================================
--- mplayerxp/libao2/ao_esd.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libao2/ao_esd.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -317,7 +317,7 @@
  * it should round it down to outburst*n
  * return: number of bytes played
  */
-static unsigned play(void* data, unsigned len, unsigned flags)
+static unsigned play(any_t* data, unsigned len, unsigned flags)
 {
     unsigned offs;
     unsigned nwritten;

Modified: mplayerxp/libao2/ao_jack.c
===================================================================
--- mplayerxp/libao2/ao_jack.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libao2/ao_jack.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -99,7 +99,7 @@
   int pos;
 };
 
-static void deinterleave(void *info, void *src, int len) {
+static void deinterleave(any_t*info, any_t*src, int len) {
   struct deinterleave *di = info;
   float *s = src;
   int i;
@@ -165,7 +165,7 @@
  *
  * Write silence into buffers if paused or an underrun occured
  */
-static int outputaudio(jack_nframes_t nframes, void *arg) {
+static int outputaudio(jack_nframes_t nframes, any_t*arg) {
   float *bufs[MAX_CHANS];
   unsigned i;
   UNUSED(arg);
@@ -355,7 +355,7 @@
 /**
  * \brief write data into buffer and reset underrun flag
  */
-static unsigned play(void *data, unsigned len, unsigned flags) {
+static unsigned play(any_t*data, unsigned len, unsigned flags) {
   underrun = 0;
   UNUSED(flags);
   return write_buffer(data, len);

Modified: mplayerxp/libao2/ao_nas.c
===================================================================
--- mplayerxp/libao2/ao_nas.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libao2/ao_nas.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -208,7 +208,7 @@
 	return num;
 }
 
-static int nas_writeBuffer(struct ao_nas_data *nas_data, void *data, unsigned int len)
+static int nas_writeBuffer(struct ao_nas_data *nas_data, any_t*data, unsigned int len)
 {
 	pthread_mutex_lock(&nas_data->buffer_mutex);
 	MSG_DBG2("ao_nas: nas_writeBuffer(): len=%d client=%d/%d server=%d/%d\n",
@@ -239,7 +239,7 @@
 	return result;
 }
 
-static void *nas_event_thread_start(void *data)
+static any_t*nas_event_thread_start(any_t*data)
 {
 	struct ao_nas_data *nas_data = data;
 
@@ -591,7 +591,7 @@
 // plays 'len' bytes of 'data'
 // it should round it down to outburst*n
 // return: number of bytes played
-static unsigned play(void* data,unsigned len,unsigned flags)
+static unsigned play(any_t* data,unsigned len,unsigned flags)
 {
 	unsigned written, maxbursts = 0, playbursts = 0;
 	AuStatus as;

Modified: mplayerxp/libao2/ao_null.c
===================================================================
--- mplayerxp/libao2/ao_null.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libao2/ao_null.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -206,7 +206,7 @@
 // plays 'len' bytes of 'data'
 // it should round it down to outburst*n
 // return: number of bytes played
-static unsigned __FASTCALL__ play(void* data,unsigned len,unsigned flags)
+static unsigned __FASTCALL__ play(any_t* data,unsigned len,unsigned flags)
 {
     unsigned maxbursts = (ao_data.buffersize - null.buffer) / ao_data.outburst;
     unsigned playbursts = len / ao_data.outburst;

Modified: mplayerxp/libao2/ao_openal.c
===================================================================
--- mplayerxp/libao2/ao_openal.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libao2/ao_openal.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -231,7 +231,7 @@
 /**
  * \brief write data into buffer and reset underrun flag
  */
-static unsigned play(void *data, unsigned len, unsigned flags) {
+static unsigned play(any_t*data, unsigned len, unsigned flags) {
   ALint state;
   unsigned i, j, k;
   unsigned ch;

Modified: mplayerxp/libao2/ao_oss.c
===================================================================
--- mplayerxp/libao2/ao_oss.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libao2/ao_oss.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -306,7 +306,7 @@
 
   if(ao_data.buffersize==0){
     // Measuring buffer size:
-    void* data;
+    any_t* data;
     ao_data.buffersize=0;
 #ifdef HAVE_AUDIO_SELECT
     data=malloc(ao_data.outburst); memset(data,0,ao_data.outburst);
@@ -418,7 +418,7 @@
 // plays 'len' bytes of 'data'
 // it should round it down to outburst*n
 // return: number of bytes played
-static unsigned __FASTCALL__ play(void* data,unsigned len,unsigned flags){
+static unsigned __FASTCALL__ play(any_t* data,unsigned len,unsigned flags){
     UNUSED(flags);
     len/=ao_data.outburst;
     len=write(oss.fd,data,len*ao_data.outburst);

Modified: mplayerxp/libao2/ao_sdl.c
===================================================================
--- mplayerxp/libao2/ao_sdl.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libao2/ao_sdl.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -135,7 +135,7 @@
 }
 
 // SDL Callback function
-static void outputaudio(void *unused, Uint8 *stream, int len) {
+static void outputaudio(any_t*unused, Uint8 *stream, int len) {
     UNUSED(unused);
     read_buffer(stream, len);
 }
@@ -204,7 +204,7 @@
 	aspec.samples  = SAMPLESIZE;
 
 	/* This should be set to a function that will be called when the audio device is ready for more data. It is passed a pointer to the audio sdl.buffer, and the length in bytes of the audio sdl.buffer. This function usually runs in a separate thread, and so you should protect data structures that it accesses by calling SDL_LockAudio and SDL_UnlockAudio in your code. The callback prototype is:
-void callback(void *userdata, Uint8 *stream, int len); userdata is the pointer stored in userdata field of the SDL_AudioSpec. stream is a pointer to the audio sdl.buffer you want to fill with information and len is the length of the audio sdl.buffer in bytes. */
+void callback(any_t*userdata, Uint8 *stream, int len); userdata is the pointer stored in userdata field of the SDL_AudioSpec. stream is a pointer to the audio sdl.buffer you want to fill with information and len is the length of the audio sdl.buffer in bytes. */
 	aspec.callback = outputaudio;
 
 	/* This pointer is passed as the first parameter to the callback function. */
@@ -308,7 +308,7 @@
 // plays 'len' bytes of 'data'
 // it should round it down to outburst*n
 // return: number of bytes played
-static unsigned __FASTCALL__ play(void* data,unsigned len,unsigned flags)
+static unsigned __FASTCALL__ play(any_t* data,unsigned len,unsigned flags)
 {
     UNUSED(flags);
 #if 0

Modified: mplayerxp/libao2/ao_wav.c
===================================================================
--- mplayerxp/libao2/ao_wav.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libao2/ao_wav.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -220,7 +220,7 @@
 // plays 'len' bytes of 'data'
 // it should round it down to outburst*n
 // return: number of bytes played
-static unsigned play(void* data,unsigned len,unsigned flags){
+static unsigned play(any_t* data,unsigned len,unsigned flags){
     UNUSED(flags);
     fwrite(data,len,1,wav.fp);
     if(wav.pcm_waveheader)

Modified: mplayerxp/libao2/audio_out.c
===================================================================
--- mplayerxp/libao2/audio_out.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libao2/audio_out.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -243,7 +243,7 @@
     return ao_inited?audio_out->get_delay():0;
 }
 
-unsigned __FASTCALL__ ao_play(void* data,unsigned len,unsigned flags)
+unsigned __FASTCALL__ ao_play(any_t* data,unsigned len,unsigned flags)
 {
     return ao_inited?audio_out->play(data,len,flags):0;
 }

Modified: mplayerxp/libao2/audio_out.h
===================================================================
--- mplayerxp/libao2/audio_out.h	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libao2/audio_out.h	2012-10-17 11:27:01 UTC (rev 166)
@@ -52,7 +52,7 @@
 	  * @param flags	currently unused
 	  * return		number of bytes which were copied into audio card
 	**/
-	unsigned (* __FASTCALL__ play)(void* data,unsigned len,unsigned flags);
+	unsigned (* __FASTCALL__ play)(any_t* data,unsigned len,unsigned flags);
 
 	/** Returns delay in seconds between first and last sample in buffer **/
 	float (*get_delay)(void);
@@ -113,7 +113,7 @@
 extern void		ao_uninit(void);
 extern void		ao_reset(void);
 extern unsigned		ao_get_space(void);
-extern unsigned		 __FASTCALL__ ao_play(void* data,unsigned len,unsigned flags);
+extern unsigned		 __FASTCALL__ ao_play(any_t* data,unsigned len,unsigned flags);
 extern float		ao_get_delay(void);
 extern void		ao_pause(void);
 extern void		ao_resume(void);

Modified: mplayerxp/libao2/audio_out_internal.h
===================================================================
--- mplayerxp/libao2/audio_out_internal.h	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libao2/audio_out_internal.h	2012-10-17 11:27:01 UTC (rev 166)
@@ -7,7 +7,7 @@
 static void uninit(void);
 static void reset(void);
 static unsigned get_space(void);
-static unsigned __FASTCALL__ play(void* data,unsigned len,unsigned flags);
+static unsigned __FASTCALL__ play(any_t* data,unsigned len,unsigned flags);
 static float get_delay(void);
 static void audio_pause(void);
 static void audio_resume(void);

Modified: mplayerxp/libmpcodecs/ad.h
===================================================================
--- mplayerxp/libmpcodecs/ad.h	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad.h	2012-10-17 11:27:01 UTC (rev 166)
@@ -34,7 +34,7 @@
 	int (*preinit)(sh_audio_t *);
 	int (*init)(sh_audio_t *sh);
 	void (*uninit)(sh_audio_t *sh);
-	int (*control)(sh_audio_t *sh,int cmd,void* arg, ...);
+	int (*control)(sh_audio_t *sh,int cmd,any_t* arg, ...);
 	unsigned (*decode_audio)(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts);
 } ad_functions_t;
 

Modified: mplayerxp/libmpcodecs/ad_a52.c
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_a52.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -193,7 +193,7 @@
   free(sh->context);
 }
 
-int control(sh_audio_t *sh,int cmd,void* arg, ...)
+int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
 {
     UNUSED(arg);
     switch(cmd)

Modified: mplayerxp/libmpcodecs/ad_acm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_acm.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -158,7 +158,7 @@
   free(sh->context);
 }
 
-int control(sh_audio_t *sh_audio,int cmd,void* arg, ...)
+int control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
 {
   int skip;
     switch(cmd)

Modified: mplayerxp/libmpcodecs/ad_dca.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_dca.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -194,7 +194,7 @@
   free(sh->context);
 }
 
-int control(sh_audio_t *sh,int cmd,void* arg, ...)
+int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
 {
     UNUSED(arg);
     switch(cmd)

Modified: mplayerxp/libmpcodecs/ad_dmo.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dmo.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_dmo.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -71,7 +71,7 @@
     free(priv);
 }
 
-static int control(sh_audio_t *sh_audio,int cmd,void* arg, ...)
+static int control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
 {
   int skip;
   UNUSED(arg);

Modified: mplayerxp/libmpcodecs/ad_dshow.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dshow.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_dshow.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -62,7 +62,7 @@
   free(priv);
 }
 
-int control(sh_audio_t *sh_audio,int cmd,void* arg, ...)
+int control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
 {
   int skip;
     UNUSED(arg);

Modified: mplayerxp/libmpcodecs/ad_dvdpcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_dvdpcm.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_dvdpcm.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -72,7 +72,7 @@
     UNUSED(sh);
 }
 
-int control(sh_audio_t *sh,int cmd,void* arg, ...)
+int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
 {
   int skip;
   UNUSED(arg);

Modified: mplayerxp/libmpcodecs/ad_faad.c
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_faad.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -3,6 +3,7 @@
  * (c)2002 by Felix Buenemann <atmosfear at users.sourceforge.net>
  * File licensed under the GPL, see http://www.fsf.org/ for more info.
  */
+#include "mp_config.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -40,7 +41,7 @@
   float pts;
 }faad_priv_t;
 
-typedef void *NeAACDecHandle;
+typedef any_t*NeAACDecHandle;
 typedef struct NeAACDecConfiguration
 {
     unsigned char defObjectType;
@@ -122,7 +123,7 @@
 
 static void (*NEAACDECAPI NeAACDecClose_ptr)(NeAACDecHandle hDecoder);
 #define NeAACDecClose(a) (*NeAACDecClose_ptr)(a)
-static void* (*NEAACDECAPI NeAACDecDecode_ptr)(NeAACDecHandle hDecoder,
+static any_t* (*NEAACDECAPI NeAACDecDecode_ptr)(NeAACDecHandle hDecoder,
                             NeAACDecFrameInfo *hInfo,
                             unsigned char *buffer,
                             unsigned long buffer_size);
@@ -135,7 +136,7 @@
 static NeAACDecHandle NeAAC_hdec;
 static NeAACDecFrameInfo NeAAC_finfo;
 
-static void *dll_handle;
+static any_t*dll_handle;
 static int load_dll(const char *libname)
 {
   if(!(dll_handle=ld_codec(libname,mpcodecs_ad_faad.info->url))) return 0;
@@ -266,7 +267,7 @@
   free(sh->context);
 }
 
-static int control(sh_audio_t *sh,int cmd,void* arg, ...)
+static int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
 {
   UNUSED(sh);
   UNUSED(cmd);
@@ -279,7 +280,7 @@
   faad_priv_t *priv=sh->context;
   int j = 0;
   unsigned len = 0;
-  void *NeAAC_sample_buffer;
+  any_t*NeAAC_sample_buffer;
   UNUSED(maxlen);
   while(len < minlen) {
 

Modified: mplayerxp/libmpcodecs/ad_ffmp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_ffmp3.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_ffmp3.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -146,7 +146,7 @@
   acodec_inited=0;
 }
 
-int control(sh_audio_t *sh,int cmd,void* arg, ...)
+int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
 {
     UNUSED(arg);
     AVCodecContext *lavc_context = sh->context;

Modified: mplayerxp/libmpcodecs/ad_hwac3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_hwac3.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -202,7 +202,7 @@
   mpcodecs_ad_a52.uninit(sh);
 }
 
-int control(sh_audio_t *sh,int cmd,void* arg, ...)
+int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
 {
     UNUSED(arg);
     switch(cmd)

Modified: mplayerxp/libmpcodecs/ad_internal.h
===================================================================
--- mplayerxp/libmpcodecs/ad_internal.h	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_internal.h	2012-10-17 11:27:01 UTC (rev 166)
@@ -16,7 +16,7 @@
 static int init(sh_audio_t *sh);
 static int preinit(sh_audio_t *sh);
 static void uninit(sh_audio_t *sh);
-static int control(sh_audio_t *sh,int cmd,void* arg, ...);
+static int control(sh_audio_t *sh,int cmd,any_t* arg, ...);
 static unsigned decode_audio(sh_audio_t *sh_audio,unsigned char *buf,unsigned minlen,unsigned maxlen,float *pts);
 
 #define LIBAD_EXTERN(x) const ad_functions_t mpcodecs_ad_##x = {\

Modified: mplayerxp/libmpcodecs/ad_libdv.c
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_libdv.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -77,7 +77,7 @@
     free(priv->audioBuffers[i]);
 }
 
-static int control(sh_audio_t *sh,int cmd,void* arg, ...)
+static int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
 {
     // TODO!!!
   UNUSED(sh);

Modified: mplayerxp/libmpcodecs/ad_mp3.c
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_mp3.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -216,7 +216,7 @@
 #define mpg123_tell_stream(a) (*mpg123_tell_stream_ptr)(a)
 
 
-static void *dll_handle;
+static any_t*dll_handle;
 static int load_dll(const char *libname)
 {
   if(!(dll_handle=ld_codec(libname,mpcodecs_ad_mp3.info->url))) return 0;
@@ -346,7 +346,7 @@
   dlclose(dll_handle);
 }
 
-int control(sh_audio_t *sh,int cmd,void* arg, ...)
+int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
 {
   UNUSED(sh);
   UNUSED(cmd);

Modified: mplayerxp/libmpcodecs/ad_null.c
===================================================================
--- mplayerxp/libmpcodecs/ad_null.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_null.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -34,7 +34,7 @@
   UNUSED(sh);
 }
 
-int control(sh_audio_t *sh,int cmd,void* arg, ...)
+int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
 {
   UNUSED(sh);
   UNUSED(cmd);

Modified: mplayerxp/libmpcodecs/ad_pcm.c
===================================================================
--- mplayerxp/libmpcodecs/ad_pcm.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_pcm.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -67,7 +67,7 @@
     UNUSED(sh);
 }
 
-int control(sh_audio_t *sh,int cmd,void* arg, ...)
+int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
 {
   int skip;
   UNUSED(arg);

Modified: mplayerxp/libmpcodecs/ad_qtaudio.c
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_qtaudio.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -49,20 +49,20 @@
 typedef int (__cdecl* LPFUNC2)(const SoundComponentData *, const SoundComponentData *,SoundConverter *);
 typedef int (__cdecl* LPFUNC3)(SoundConverter sc);
 typedef int (__cdecl* LPFUNC4)(void);
-typedef int (__cdecl* LPFUNC5)(SoundConverter sc, OSType selector,void * infoPtr);
+typedef int (__cdecl* LPFUNC5)(SoundConverter sc, OSType selector,any_t* infoPtr);
 typedef int (__cdecl* LPFUNC6)(SoundConverter sc,
 				unsigned long inputBytesTarget,
 				unsigned long *inputFrames,
 				unsigned long *inputBytes,
 				unsigned long *outputBytes );
 typedef int (__cdecl* LPFUNC7)(SoundConverter sc,
-				const void    *inputPtr,
+				const any_t*inputPtr,
 				unsigned long inputFrames,
-				void          *outputPtr,
+				any_t*outputPtr,
 				unsigned long *outputFrames,
 				unsigned long *outputBytes );
 typedef int (__cdecl* LPFUNC8)(SoundConverter sc,
-				void      *outputPtr,
+				any_t*outputPtr,
                                 unsigned long *outputFrames,
                                 unsigned long *outputBytes);
 typedef int (__cdecl* LPFUNC9)(SoundConverter         sc);
@@ -324,7 +324,7 @@
     return ConvertedBytes;
 }
 
-static int control(sh_audio_t *sh,int cmd,void* arg, ...){
+static int control(sh_audio_t *sh,int cmd,any_t* arg, ...){
     // various optional functions you MAY implement:
   UNUSED(sh);
   UNUSED(cmd);

Modified: mplayerxp/libmpcodecs/ad_real.c
===================================================================
--- mplayerxp/libmpcodecs/ad_real.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_real.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -24,30 +24,30 @@
 
 LIBAD_EXTERN(real)
 
-static void *handle=NULL;
+static any_t*handle=NULL;
 
-void *__builtin_new(unsigned long size) {
+any_t*__builtin_new(unsigned long size) {
 	return malloc(size);
 }
 
 /* required for cook's uninit: */
-void __builtin_delete(void* ize) {
+void __builtin_delete(any_t* ize) {
 	free(ize);
 }
 
 #if defined(__FreeBSD__) || defined(__NetBSD__)
-void* __ctype_b=NULL;
+any_t* __ctype_b=NULL;
 #endif
 
 static uint32_t (*raCloseCodec)(uint32_t);
-static uint32_t (*raDecode)(void*,void*,uint32_t,void*,void*,uint32_t);
+static uint32_t (*raDecode)(any_t*,any_t*,uint32_t,any_t*,any_t*,uint32_t);
 static uint32_t (*raFreeDecoder)(uint32_t);
-static void* (*raGetFlavorProperty)(void*,uint32_t,uint32_t,void*);
+static any_t* (*raGetFlavorProperty)(any_t*,uint32_t,uint32_t,any_t*);
 //static uint32_t (*raGetNumberOfFlavors2)(void);
-static uint32_t (*raInitDecoder)(void*,void*);
-static uint32_t (*raOpenCodec2)(void*,void*);
-static uint32_t (*raOpenCodec)(void*);
-static uint32_t (*raSetFlavor)(void*,uint32_t);
+static uint32_t (*raInitDecoder)(any_t*,any_t*);
+static uint32_t (*raOpenCodec2)(any_t*,any_t*);
+static uint32_t (*raOpenCodec)(any_t*);
+static uint32_t (*raSetFlavor)(any_t*,uint32_t);
 static void  (*raSetDLLAccessPath)(uint32_t);
 static void  (*raSetPwd)(char*,char*);
 
@@ -60,11 +60,11 @@
     int bits_per_frame;
     int packetsize;
     int extradata_len;
-    void* extradata;
+    any_t* extradata;
 } ra_init_t;
 
 typedef struct {
-    void *internal;
+    any_t*internal;
     float pts;
 } real_priv_t;
 
@@ -73,7 +73,7 @@
   // (you should do that if you use external lib(s) which is optional)
   unsigned int result;
   int len=0;
-  void* prop;
+  any_t* prop;
   char path[4096];
   char cpath[4096];
   real_priv_t *rpriv;
@@ -281,7 +281,7 @@
               // or -1 for EOF (or uncorrectable error)
 }
 
-static int control(sh_audio_t *sh,int cmd,void* arg, ...){
+static int control(sh_audio_t *sh,int cmd,any_t* arg, ...){
     UNUSED(sh);
     UNUSED(arg);
     // various optional functions you MAY implement:

Modified: mplayerxp/libmpcodecs/ad_twin.c
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_twin.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -105,7 +105,7 @@
 	/* EBC info */
     int  *bc[ N_CH_MAX ];
 
-    void *manager;
+    any_t*manager;
 } INDEX;
 
 /***********************************************/
@@ -350,7 +350,7 @@
   FreeLibrary(vqf_dll);
 }
 
-int control(sh_audio_t *sh_audio,int cmd,void* arg, ...)
+int control(sh_audio_t *sh_audio,int cmd,any_t* arg, ...)
 {
   int skip;
   UNUSED(arg);

Modified: mplayerxp/libmpcodecs/ad_vorbis.c
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/ad_vorbis.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -121,7 +121,7 @@
   free(sh->context);
 }
 
-static int control(sh_audio_t *sh,int cmd,void* arg, ...)
+static int control(sh_audio_t *sh,int cmd,any_t* arg, ...)
 {
     UNUSED(sh);
     UNUSED(cmd);

Modified: mplayerxp/libmpcodecs/codecs_ld.c
===================================================================
--- mplayerxp/libmpcodecs/codecs_ld.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/codecs_ld.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -12,9 +12,9 @@
 #define MSGT_CLASS MSGT_GLOBAL
 #include "../__mp_msg.h"
 
-void * ld_codec(const char *name,const char *url_hint)
+any_t* ld_codec(const char *name,const char *url_hint)
 {
-  void *dll_handle;
+  any_t*dll_handle;
   if(!(dll_handle=dlopen(name,RTLD_LAZY|RTLD_GLOBAL)))
   {
     MSG_FATAL(MSGTR_CODEC_CANT_LOAD_DLL,name,dlerror());
@@ -36,18 +36,18 @@
 }
 #endif
 
-void * ld_sym(void *handle,const char *sym_name)
+any_t* ld_sym(any_t*handle,const char *sym_name)
 {
-  void *rval;
+  any_t*rval;
   if(!(rval=dlsym(handle,sym_name))) {
     MSG_ERR(MSGTR_CODEC_DLL_SYM_ERR,sym_name);
   }
   return rval;
 }
 
-void * ld_aliased_sym(void *handle,const char *sym_name,...)
+any_t* ld_aliased_sym(any_t*handle,const char *sym_name,...)
 {
-  void *rval=dlsym(handle,sym_name);
+  any_t*rval=dlsym(handle,sym_name);
   if(!rval) {
     const char *alias;
     va_list list;

Modified: mplayerxp/libmpcodecs/codecs_ld.h
===================================================================
--- mplayerxp/libmpcodecs/codecs_ld.h	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/codecs_ld.h	2012-10-17 11:27:01 UTC (rev 166)
@@ -5,11 +5,13 @@
 #ifndef __CODECS_LD
 #define __CODECS_LD
 
-extern void * ld_codec(const char *name,const char *url_hint);
+#include "mp_config.h"
+
+extern any_t* ld_codec(const char *name,const char *url_hint);
 /*extern char * codec_name( const char *name );*/
 
-extern void * ld_sym(void *handle,const char *sym_name);
-extern void * ld_aliased_sym(void *handle,const char *sym_name,...);
+extern any_t* ld_sym(any_t*handle,const char *sym_name);
+extern any_t* ld_aliased_sym(any_t*handle,const char *sym_name,...);
 #if defined(__OpenBSD__) && !defined(__ELF__)
 #define dlsym(h,s) ld_sym(h, "_" s)
 #endif

Modified: mplayerxp/libmpcodecs/dec_audio.c
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/dec_audio.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -191,7 +191,7 @@
 
   *out_samplerate=afs->output.rate;
   *out_channels=afs->output.nch;
-  *out_format=af_format_encode((void*)(&afs->output));
+  *out_format=af_format_encode((any_t*)(&afs->output));
 
   sh_audio->af_bps = afs->output.rate*afs->output.nch*afs->output.bps;
 
@@ -199,7 +199,7 @@
       afs->output.bps, afs->output.nch, afs->output.rate,
       fmt2str(afs->output.format,afs->output.bps,strbuf,200));
 
-  sh_audio->afilter=(void*)afs;
+  sh_audio->afilter=(any_t*)afs;
   return 1;
 }
 
@@ -247,7 +247,7 @@
   sh_audio->a_buffer_len=0;
 
   af_showconf(afs->first);
-  sh_audio->afilter=(void*)afs;
+  sh_audio->afilter=(any_t*)afs;
   sh_audio->afilter_inited=1;
   return 1;
 }

Modified: mplayerxp/libmpcodecs/dec_video.c
===================================================================
--- mplayerxp/libmpcodecs/dec_video.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/dec_video.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -55,7 +55,7 @@
 
 void set_video_quality(sh_video_t *sh_video,int quality){
   if(mpvdec)
-    mpvdec->control(sh_video,VDCTRL_SET_PP_LEVEL, (void*)(&quality));
+    mpvdec->control(sh_video,VDCTRL_SET_PP_LEVEL, (any_t*)(&quality));
 }
 
 int set_video_colors(sh_video_t *sh_video,char *item,int value)

Modified: mplayerxp/libmpcodecs/liba52/a52.h
===================================================================
--- mplayerxp/libmpcodecs/liba52/a52.h	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/liba52/a52.h	2012-10-17 11:27:01 UTC (rev 166)
@@ -24,6 +24,8 @@
 #ifndef A52_H
 #define A52_H
 
+#include "mp_config.h"
+
 #ifndef LIBA52_DOUBLE
 typedef float sample_t;
 #else
@@ -55,12 +57,12 @@
 extern int a52_frame (a52_state_t * state, uint8_t * buf, int * flags,
 			sample_t * level, sample_t bias);
 extern void a52_dynrng (a52_state_t * state,
-			sample_t (* call) (sample_t, void *), void * data);
+			sample_t (* call) (sample_t, any_t*), any_t* data);
 extern int a52_block (a52_state_t * state);
 extern void a52_free (a52_state_t * state);
 extern uint16_t crc16_block(uint8_t *data,uint32_t num_bytes);
-extern void* a52_resample_init_float(a52_state_t * state,uint32_t mm_accel,int flags,int chans);
-extern void* a52_resample_init(a52_state_t * state,uint32_t mm_accel,int flags,int chans);
+extern any_t* a52_resample_init_float(a52_state_t * state,uint32_t mm_accel,int flags,int chans);
+extern any_t* a52_resample_init(a52_state_t * state,uint32_t mm_accel,int flags,int chans);
 extern int (* a52_resample) (float * _f, int16_t * s16);
 extern int (* a52_resample32) (float * _f, float * s16);
 

Modified: mplayerxp/libmpcodecs/liba52/a52_internal.h
===================================================================
--- mplayerxp/libmpcodecs/liba52/a52_internal.h	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/liba52/a52_internal.h	2012-10-17 11:27:01 UTC (rev 166)
@@ -46,8 +46,8 @@
 
     int dynrnge;		/* apply dynamic range */
     sample_t dynrng;		/* dynamic range */
-    void * dynrngdata;		/* dynamic range callback funtion and data */
-    sample_t (* dynrngcall) (sample_t range, void * dynrngdata);
+    any_t* dynrngdata;		/* dynamic range callback funtion and data */
+    sample_t (* dynrngcall) (sample_t range, any_t* dynrngdata);
 
     uint8_t chincpl;		/* channel coupled */
     uint8_t phsflginu;		/* phase flags in use (stereo only) */

Modified: mplayerxp/libmpcodecs/liba52/parse.c
===================================================================
--- mplayerxp/libmpcodecs/liba52/parse.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/liba52/parse.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -35,7 +35,7 @@
 
 #ifdef HAVE_MEMALIGN
 /* some systems have memalign() but no declaration for it */
-void * memalign (size_t align, size_t size);
+any_t* memalign (size_t align, size_t size);
 #else
 /* assume malloc alignment is sufficient */
 #define memalign(align,size) malloc (size)
@@ -207,7 +207,7 @@
 }
 
 void a52_dynrng (a52_state_t * state,
-		 sample_t (* call) (sample_t, void *), void * data)
+		 sample_t (* call) (sample_t, any_t*), any_t* data)
 {
     state->dynrnge = 0;
     if (call) {

Modified: mplayerxp/libmpcodecs/liba52/resample.c
===================================================================
--- mplayerxp/libmpcodecs/liba52/resample.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/liba52/resample.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -22,8 +22,8 @@
 #include "resample_mmx.c"
 #endif
 
-void* a52_resample_init(a52_state_t * state,uint32_t mm_accel,int flags,int chans){
-void* tmp;
+any_t* a52_resample_init(a52_state_t * state,uint32_t mm_accel,int flags,int chans){
+any_t* tmp;
 
 #ifdef CAN_COMPILE_MMX
     if(mm_accel&MM_ACCEL_X86_MMX){
@@ -47,8 +47,8 @@
     return NULL;
 }
 
-void* a52_resample_init_float(a52_state_t * state,uint32_t mm_accel,int flags,int chans){
-void* tmp;
+any_t* a52_resample_init_float(a52_state_t * state,uint32_t mm_accel,int flags,int chans){
+any_t* tmp;
 
 #if 0 //#if defined( ARCH_X86 ) || defined(ARCH_X86_64)
     if(mm_accel&MM_ACCEL_X86_MMX){

Modified: mplayerxp/libmpcodecs/liba52/resample_c.c
===================================================================
--- mplayerxp/libmpcodecs/liba52/resample_c.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/liba52/resample_c.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -143,7 +143,7 @@
 }
 
 
-static void* a52_resample_C(a52_state_t * state,int flags, int ch){
+static any_t* a52_resample_C(a52_state_t * state,int flags, int ch){
     bias=state->bias;
     level=state->level;
     switch (flags) {
@@ -312,7 +312,7 @@
     return 6*256;
 }
 
-static void* a52_resample_f32(a52_state_t * state,int flags, int ch){
+static any_t* a52_resample_f32(a52_state_t * state,int flags, int ch){
     bias=state->bias;
     level=state->level;
     switch (flags) {

Modified: mplayerxp/libmpcodecs/liba52/resample_mmx.c
===================================================================
--- mplayerxp/libmpcodecs/liba52/resample_mmx.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/liba52/resample_mmx.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -555,7 +555,7 @@
 }
 
 
-static void* a52_resample_MMX(a52_state_t * state,int flags, int ch){
+static any_t* a52_resample_MMX(a52_state_t * state,int flags, int ch){
     switch (flags) {
     case A52_MONO:
 	if(ch==5) return a52_resample_MONO_to_5_MMX;

Modified: mplayerxp/libmpcodecs/libdca/dca.h
===================================================================
--- mplayerxp/libmpcodecs/libdca/dca.h	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/libdca/dca.h	2012-10-17 11:27:01 UTC (rev 166)
@@ -23,6 +23,8 @@
 #ifndef DCA_H
 #define DCA_H
 
+#include "mp_config.h"
+
 /* x86 accelerations */
 #define MM_ACCEL_X86_MMX	0x80000000
 #define MM_ACCEL_X86_3DNOW	0x40000000
@@ -70,13 +72,13 @@
 extern int dca_frame (dca_state_t * state, uint8_t * buf, int * flags,
                level_t * level, sample_t bias);
 extern void dca_dynrng (dca_state_t * state,
-                 level_t (* call) (level_t, void *), void * data);
+                 level_t (* call) (level_t, any_t*), any_t* data);
 extern int dca_blocks_num (dca_state_t * state);
 extern int dca_block (dca_state_t * state);
 extern sample_t * dca_samples (dca_state_t * state);
 extern void dca_free (dca_state_t * state);
-extern void* dca_resample_init(dca_state_t * state,uint32_t mm_accel,int flags,int chans);
-extern void* dca_resample_init_float(dca_state_t * state,uint32_t mm_accel,int flags,int chans);
+extern any_t* dca_resample_init(dca_state_t * state,uint32_t mm_accel,int flags,int chans);
+extern any_t* dca_resample_init_float(dca_state_t * state,uint32_t mm_accel,int flags,int chans);
 extern int (*dca_resample) (float * _f, int16_t * s16);
 extern int (*dca_resample32) (float * _f, float * s16);
 

Modified: mplayerxp/libmpcodecs/libdca/dca_internal.h
===================================================================
--- mplayerxp/libmpcodecs/libdca/dca_internal.h	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/libdca/dca_internal.h	2012-10-17 11:27:01 UTC (rev 166)
@@ -129,8 +129,8 @@
 
     int dynrnge;             /* apply dynamic range */
     level_t dynrng;          /* dynamic range */
-    void * dynrngdata;       /* dynamic range callback funtion and data */
-    level_t (* dynrngcall) (level_t range, void * dynrngdata);
+    any_t* dynrngdata;       /* dynamic range callback funtion and data */
+    level_t (* dynrngcall) (level_t range, any_t* dynrngdata);
 
     /* Bitstream handling */
     uint32_t * buffer_start;

Modified: mplayerxp/libmpcodecs/libdca/parse.c
===================================================================
--- mplayerxp/libmpcodecs/libdca/parse.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/libdca/parse.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -49,7 +49,7 @@
 
 #if defined(HAVE_MEMALIGN) && !defined(__cplusplus)
 /* some systems have memalign() but no declaration for it */
-void * memalign (size_t align, size_t size);
+any_t* memalign (size_t align, size_t size);
 #else
 /* assume malloc alignment is sufficient */
 #define memalign(align,size) malloc (size)
@@ -1281,7 +1281,7 @@
 }
 
 void dca_dynrng (dca_state_t * state,
-                 level_t (* call) (level_t, void *), void * data)
+                 level_t (* call) (level_t, any_t*), any_t* data)
 {
     state->dynrange = 0;
     if (call) {

Modified: mplayerxp/libmpcodecs/libdca/resample.c
===================================================================
--- mplayerxp/libmpcodecs/libdca/resample.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/libdca/resample.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -22,8 +22,8 @@
 #include "resample_mmx.c"
 #endif
 
-void* dca_resample_init(dca_state_t * state,uint32_t mm_accel,int flags,int chans){
-void* tmp;
+any_t* dca_resample_init(dca_state_t * state,uint32_t mm_accel,int flags,int chans){
+any_t* tmp;
 
 #ifdef CAN_COMPILE_MMX
     if(mm_accel&MM_ACCEL_X86_MMX){
@@ -47,8 +47,8 @@
     return NULL;
 }
 
-void* dca_resample_init_float(dca_state_t * state,uint32_t mm_accel,int flags,int chans){
-void* tmp;
+any_t* dca_resample_init_float(dca_state_t * state,uint32_t mm_accel,int flags,int chans){
+any_t* tmp;
 
 #if 0 //#if defined( ARCH_X86 ) || defined(ARCH_X86_64)
     if(mm_accel&MM_ACCEL_X86_MMX){

Modified: mplayerxp/libmpcodecs/libdca/resample_c.c
===================================================================
--- mplayerxp/libmpcodecs/libdca/resample_c.c	2012-10-16 17:42:50 UTC (rev 165)
+++ mplayerxp/libmpcodecs/libdca/resample_c.c	2012-10-17 11:27:01 UTC (rev 166)
@@ -143,7 +143,7 @@
 }
 
 
-static void* dca_resample_C(dca_state_t * state,int flags, int ch){
+static any_t* dca_resample_C(dca_state_t * state,int flags, int ch){
     bias=state->bias;
     level=state->level;
     switch (flags) {
@@ -312,7 +312,7 @@
     return 6*256;
 }
 
-static void* dca_resample_f32(dca_state_t * state,int flags, int ch){
+static any_t* dca_resample_f32(dca_state_t * state,int flags, int ch){
     bias=state->bias;
     level=state->level;
     switch (flags) {

Modified: mplayerxp/libmpcodecs/libdca/resample_mmx.c
===================================================================
--- mplayerxp/libmpcodecs/libdca/resample_mmx.c	2012-10-16 17:42:...
 
[truncated message content]