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

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

Revision: 653
          http://sourceforge.net/p/mplayerxp/code/653
Author:   nickols_k
Date:     2013-06-12 14:05:09 +0000 (Wed, 12 Jun 2013)
Log Message:
-----------
contantization

Modified Paths:
--------------
    mplayerxp/libmpcodecs/dec_audio.cpp
    mplayerxp/libmpcodecs/dec_video.cpp
    mplayerxp/libmpcodecs/dec_video.h
    mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.cpp
    mplayerxp/libmpcodecs/libnuppelvideo/minilzo.cpp
    mplayerxp/libmpcodecs/vd_lavc.cpp
    mplayerxp/libmpcodecs/vd_libmpeg2.cpp
    mplayerxp/libmpdemux/demux_ac3.cpp
    mplayerxp/libmpdemux/demux_aiff.cpp
    mplayerxp/libmpdemux/demux_asf.cpp
    mplayerxp/libmpdemux/demux_avi.cpp
    mplayerxp/libmpdemux/demux_bmp.cpp
    mplayerxp/libmpdemux/demux_dca.cpp
    mplayerxp/libmpdemux/demux_film.cpp
    mplayerxp/libmpdemux/demux_flac.cpp
    mplayerxp/libmpdemux/demux_fli.cpp
    mplayerxp/libmpdemux/demux_mkv.cpp
    mplayerxp/libmpdemux/demux_mov.cpp
    mplayerxp/libmpdemux/demux_mp3.cpp
    mplayerxp/libmpdemux/demux_mpg.cpp
    mplayerxp/libmpdemux/demux_mpxp64.cpp
    mplayerxp/libmpdemux/demux_musepack.cpp
    mplayerxp/libmpdemux/demux_nsv.cpp
    mplayerxp/libmpdemux/demux_ogg.cpp
    mplayerxp/libmpdemux/demux_pva.cpp
    mplayerxp/libmpdemux/demux_real.cpp
    mplayerxp/libmpdemux/demux_realaud.cpp
    mplayerxp/libmpdemux/demux_roq.cpp
    mplayerxp/libmpdemux/demux_smjpeg.cpp
    mplayerxp/libmpdemux/demux_snd_au.cpp
    mplayerxp/libmpdemux/demux_ts.cpp
    mplayerxp/libmpdemux/demux_viv.cpp
    mplayerxp/libmpdemux/demux_voc.cpp
    mplayerxp/libmpdemux/demux_vqf.cpp
    mplayerxp/libmpdemux/demux_wav.cpp
    mplayerxp/libmpdemux/demux_y4m.cpp
    mplayerxp/libmpdemux/parse_mp4.cpp
    mplayerxp/libmpstream2/s_oss.cpp
    mplayerxp/libmpstream2/stream.cpp
    mplayerxp/libmpstream2/stream.h
    mplayerxp/libmpsub/vobsub.cpp
    mplayerxp/libvo2/osd_render.cpp
    mplayerxp/libvo2/osd_render_template.h
    mplayerxp/libvo2/video_out.cpp
    mplayerxp/libvo2/video_out.h
    mplayerxp/osdep/aclib_template.h
    mplayerxp/osdep/mplib.h
    mplayerxp/osdep/vbelib.cpp
    mplayerxp/postproc/af.cpp
    mplayerxp/postproc/af.h
    mplayerxp/postproc/af_ao3.cpp
    mplayerxp/postproc/af_channels.cpp
    mplayerxp/postproc/af_crystality.cpp
    mplayerxp/postproc/af_delay.cpp
    mplayerxp/postproc/af_dyn.cpp
    mplayerxp/postproc/af_echo3d.cpp
    mplayerxp/postproc/af_equalizer.cpp
    mplayerxp/postproc/af_export.cpp
    mplayerxp/postproc/af_extrastereo.cpp
    mplayerxp/postproc/af_ffenc.cpp
    mplayerxp/postproc/af_format.cpp
    mplayerxp/postproc/af_hrtf.cpp
    mplayerxp/postproc/af_internal.h
    mplayerxp/postproc/af_karaoke.cpp
    mplayerxp/postproc/af_lp.cpp
    mplayerxp/postproc/af_pan.cpp
    mplayerxp/postproc/af_raw.cpp
    mplayerxp/postproc/af_resample.cpp
    mplayerxp/postproc/af_scaletempo.cpp
    mplayerxp/postproc/af_sinesuppress.cpp
    mplayerxp/postproc/af_sub.cpp
    mplayerxp/postproc/af_surround.cpp
    mplayerxp/postproc/af_volnorm.cpp
    mplayerxp/postproc/af_volume.cpp
    mplayerxp/postproc/aflib.cpp
    mplayerxp/postproc/aflib.h
    mplayerxp/postproc/aflib_accel.h
    mplayerxp/postproc/libmenu/menu.cpp
    mplayerxp/postproc/libmenu/menu.h
    mplayerxp/postproc/libmenu/menu_console.cpp
    mplayerxp/postproc/libmenu/menu_list.cpp
    mplayerxp/postproc/libmenu/menu_list.h
    mplayerxp/postproc/libmenu/menu_txt.cpp
    mplayerxp/postproc/vf.cpp
    mplayerxp/postproc/vf.h
    mplayerxp/postproc/vf_1bpp.cpp
    mplayerxp/postproc/vf_2xsai.cpp
    mplayerxp/postproc/vf_delogo.cpp
    mplayerxp/postproc/vf_denoise3d.cpp
    mplayerxp/postproc/vf_dint.cpp
    mplayerxp/postproc/vf_down3dright.cpp
    mplayerxp/postproc/vf_eq.cpp
    mplayerxp/postproc/vf_expand.cpp
    mplayerxp/postproc/vf_flip.cpp
    mplayerxp/postproc/vf_framestep.cpp
    mplayerxp/postproc/vf_il.cpp
    mplayerxp/postproc/vf_internal.h
    mplayerxp/postproc/vf_menu.cpp
    mplayerxp/postproc/vf_mirror.cpp
    mplayerxp/postproc/vf_noise.cpp
    mplayerxp/postproc/vf_ow.cpp
    mplayerxp/postproc/vf_palette.cpp
    mplayerxp/postproc/vf_panscan.cpp
    mplayerxp/postproc/vf_perspective.cpp
    mplayerxp/postproc/vf_pp.cpp
    mplayerxp/postproc/vf_raw.cpp
    mplayerxp/postproc/vf_rectangle.cpp
    mplayerxp/postproc/vf_rgb2bgr.cpp
    mplayerxp/postproc/vf_rotate.cpp
    mplayerxp/postproc/vf_scale.cpp
    mplayerxp/postproc/vf_smartblur.cpp
    mplayerxp/postproc/vf_softpulldown.cpp
    mplayerxp/postproc/vf_swapuv.cpp
    mplayerxp/postproc/vf_test.cpp
    mplayerxp/postproc/vf_unsharp.cpp
    mplayerxp/postproc/vf_vo2.cpp
    mplayerxp/postproc/vf_yuvcsp.cpp
    mplayerxp/postproc/vf_yuy2.cpp
    mplayerxp/postproc/vf_yvu9.cpp
    mplayerxp/xmpcore/xmp_aframe.cpp
    mplayerxp/xmpcore/xmp_aframe.h
    mplayerxp/xmpcore/xmp_image.cpp
    mplayerxp/xmpcore/xmp_image.h

Modified: mplayerxp/libmpcodecs/dec_audio.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpcodecs/dec_audio.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -174,7 +174,6 @@
 	unsigned& out_samplerate, unsigned& out_channels, unsigned& out_format) const {
     decaudio_priv_t& priv = reinterpret_cast<decaudio_priv_t&>(ad_private);
     sh_audio_t& sh = priv.parent;
-    char strbuf[200];
     af_stream_t* afs=af_new(&sh);
 
     // input format: same as codec's output format:
@@ -206,7 +205,7 @@
 
     sh.af_bps = afs->output.rate*afs->output.nch*(afs->output.format&MPAF_BPS_MASK);
 
-    mpxp_v<<"AF_pre: af format: "<<afs->output.nch<<" ch, "<<afs->output.rate<<" hz, "<<mpaf_fmt2str(afs->output.format,strbuf,200)
+    mpxp_v<<"AF_pre: af format: "<<afs->output.nch<<" ch, "<<afs->output.rate<<" hz, "<<mpaf_fmt2str(afs->output.format)
 	<<" af_bps="<<sh.af_bps<<std::endl;
 
     priv.afi.afilter=afs;
@@ -219,7 +218,6 @@
 	unsigned out_minsize, unsigned out_maxsize) const {
     decaudio_priv_t& priv = reinterpret_cast<decaudio_priv_t&>(ad_private);
     sh_audio_t& sh = priv.parent;
-    char strbuf[200];
     af_stream_t* afs=priv.afi.afilter;
     if(!afs) afs = af_new(&sh);
 
@@ -254,7 +252,7 @@
     sh.af_bps = afs->output.rate*afs->output.nch*(afs->output.format&MPAF_BPS_MASK);
 
     mpxp_v<<"AF_init: af format: "<<afs->output.nch<<" ch, "<<afs->output.rate
-	<<" hz, "<<mpaf_fmt2str(afs->output.format,strbuf,200)<<" af_bps="<<sh.af_bps<<std::endl;
+	<<" hz, "<<mpaf_fmt2str(afs->output.format)<<" af_bps="<<sh.af_bps<<std::endl;
 
     sh.a_buffer_size=out_maxsize;
     sh.a_buffer=new char [sh.a_buffer_size];
@@ -315,36 +313,25 @@
     mpxp_dbg2<<"decaudio: "<<len<<" bytes "<<pts<<" pts min "<<minlen<<" max "<<maxlen<<" buflen "<<buflen<<" o_bps="<<sh.o_bps<<" f_bps="<<sh.af_bps<<std::endl;
     if(len==0 || !priv.afi.afilter) return 0; // EOF?
     // run the filters:
-    mp_aframe_t*  afd;  // filter input
-    mp_aframe_t* pafd; // filter output
-    afd=new_mp_aframe(	sh.rate,
-			sh.nch,
-			afmt2mpaf(sh.afmt)
-			,0); // xp_idx
+    mp_aframe_t*  afd=new(zeromem) mp_aframe_t(sh.rate,sh.nch,afmt2mpaf(sh.afmt),0); // xp_idx
     afd->audio=buf;
     afd->len=len;
-    pafd=af_play(priv.afi.afilter,afd);
+    mp_aframe_t pafd=af_play(priv.afi.afilter,*afd);
     afd->audio=NULL; // fake no buffer
 
-    if(!pafd) {
-	mpxp_v<<"decaudio: filter error"<<std::endl;
-	return 0; // error
-    }
+    mpxp_dbg2<<"decaudio: "<<std::hex<<pafd.format<<" in="<<len<<" out="<<pafd.len<<" (min "<<minlen<<" max "<<maxlen<<" buf "<<buflen<<")"<<std::endl;
 
-    mpxp_dbg2<<"decaudio: "<<std::hex<<pafd->format<<" in="<<len<<" out="<<pafd->len<<" (min "<<minlen<<" max "<<maxlen<<" buf "<<buflen<<")"<<std::endl;
-
-    cp_size=pafd->len;
-    cp_size=std::min(buflen,pafd->len);
-    memcpy(buf,pafd->audio,cp_size);
-    cp_tile=pafd->len-cp_size;
+    cp_size=pafd.len;
+    cp_size=std::min(buflen,pafd.len);
+    memcpy(buf,pafd.audio,cp_size);
+    cp_tile=pafd.len-cp_size;
     if(cp_tile) {
-	sh.af_buffer=&((char *)pafd->audio)[cp_size];
+	sh.af_buffer=&((char *)pafd.audio)[cp_size];
 	sh.af_buffer_len=cp_tile;
 	sh.af_pts = pts+(float)cp_size/(float)sh.af_bps;
 	mpxp_dbg2<<"decaudio: afilter->cache "<<cp_tile<<" bytes "<<pts<<" pts"<<std::endl;
     } else sh.af_buffer_len=0;
-    if(pafd!=afd) free_mp_aframe(pafd);
-    free_mp_aframe(afd);
+    delete afd;
     return cp_size;
 }
 

Modified: mplayerxp/libmpcodecs/dec_video.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_video.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpcodecs/dec_video.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -186,16 +186,16 @@
     print_codec_info();
 }
 
-void VD_Interface::draw_image(const mp_image_t* mpi) const
+void VD_Interface::draw_image(const mp_image_t& smpi) const
 {
     decvideo_priv_t& priv=reinterpret_cast<decvideo_priv_t&>(vd_private);
     vf_stream_t* s;
     const unsigned h_step=16;
-    unsigned num_slices = mpi->h/h_step;
+    unsigned num_slices = smpi.h/h_step;
     s=priv.vfilter;
 
-  if(!(mpi->flags&(MP_IMGFLAG_DRAW_CALLBACK))){
-    if(mpi->h%h_step) num_slices++;
+  if(!(smpi.flags&(MP_IMGFLAG_DRAW_CALLBACK))){
+    if(smpi.h%h_step) num_slices++;
     if(priv.psi.vf_flags&VF_FLAGS_SLICES)
     {
 	unsigned j,i,y;
@@ -207,8 +207,8 @@
 	}
 	y=0;
 	for(i=0;i<num_slices;i++) {
-	    ampi[i]=new_mp_image(mpi->w,y,h_step);
-	    mpi_fake_slice(ampi[i],mpi,y,h_step);
+	    ampi[i]=new(zeromem) mp_image_t(smpi.w,y,h_step);
+	    ampi[i]->fake_slice(smpi,y,h_step);
 	    y+=h_step;
 	}
 #ifdef _OPENMP
@@ -218,13 +218,13 @@
 		for(i=j;i<priv.smp_num_cpus;i++) {
 		    mpxp_dbg2<<"parallel: dec_video.put_slice["<<ampi[i]->width<<"x"<<ampi[i]->height
 			<<"] "<<ampi[i]->x<<" "<<ampi[i]->y<<" "<<ampi[i]->w<<" "<<ampi[i]->h<<std::endl;
-		    vf_put_slice(s,ampi[i]);
+		    vf_put_slice(s,*ampi[i]);
 		}
 	    }
 	    for(;j<num_slices;j++) {
 		mpxp_dbg2<<"par_tail: dec_video.put_slice["<<ampi[i]->width<<"x"<<ampi[i]->height
 		    <<"] "<<ampi[i]->x<<" "<<ampi[i]->y<<" "<<ampi[i]->w<<" "<<ampi[i]->h<<std::endl;
-		vf_put_slice(s,ampi[j]);
+		vf_put_slice(s,*ampi[j]);
 	    }
 	}
 	else
@@ -234,16 +234,15 @@
 	    for(i=0;i<num_slices;i++) {
 		mpxp_dbg2<<"dec_video.put_slice["<<ampi[i]->width<<"x"<<ampi[i]->height
 		    <<"] "<<ampi[i]->x<<" "<<ampi[i]->y<<" "<<ampi[i]->w<<" "<<ampi[i]->h<<std::endl;
-		vf_put_slice(s,ampi[i]);
+		vf_put_slice(s,*ampi[i]);
 	    }
 	}
-	for(i=0;i<num_slices;i++) free_mp_image(ampi[i]);
+	for(i=0;i<num_slices;i++) delete ampi[i];
     } else {
-	mpxp_dbg2<<"Put whole frame["<<mpi->width<<"x"<<mpi->height<<"]"<<std::endl;
-	mp_image_t dmpi=*mpi;
-	vf_put_slice(s,&dmpi);
+	mpxp_dbg2<<"Put whole frame["<<smpi.width<<"x"<<smpi.height<<"]"<<std::endl;
+	vf_put_slice(s,smpi);
     }
-    free_mp_image(mpi);
+    delete &smpi;
   }
 }
 
@@ -267,7 +266,7 @@
 /* ------------------------ frame decoded. -------------------- */
 
     if(!mpi) return 0; // error / skipped frame
-    draw_image(mpi);
+    draw_image(*mpi);
 
     t2=GetTimer();t=t2-t;
     tt = t*0.000001f;
@@ -537,10 +536,9 @@
     return mpi;
 }
 
-void VD_Interface::draw_slice(const mp_image_t* mpi) const {
+void VD_Interface::draw_slice(const mp_image_t& mpi) const {
     decvideo_priv_t& priv=reinterpret_cast<decvideo_priv_t&>(vd_private);
     vf_stream_t* vf = priv.vfilter;
-    mp_image_t dmpi = *mpi;
-    vf_put_slice(vf,&dmpi);
+    vf_put_slice(vf,mpi);
 }
 } // namespace	usr
\ No newline at end of file

Modified: mplayerxp/libmpcodecs/dec_video.h
===================================================================
--- mplayerxp/libmpcodecs/dec_video.h	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpcodecs/dec_video.h	2013-06-12 14:05:09 UTC (rev 653)
@@ -23,8 +23,8 @@
 
 	    virtual MPXP_Rc	config_vf(int w, int h) const;
 	    virtual mp_image_t*	get_image(int mp_imgtype, int mp_imgflag,int w, int h) const;
-	    virtual void	draw_slice(const mp_image_t*) const;
-	    virtual void	draw_image(const mp_image_t*) const;
+	    virtual void	draw_slice(const mp_image_t&) const;
+	    virtual void	draw_image(const mp_image_t&) const;
 	    static void		print_help();
 	private:
 	    void		print_codec_info() const;

Modified: mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.cpp
===================================================================
--- mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpcodecs/libnuppelvideo/RTjpegN.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -131,10 +131,10 @@
 
 int RTjpeg_b2s(__s16 *data, __s8 *strm, __u8 bt8)
 {
- register int ci, co=1;
- register __s16 ZZvalue;
- register unsigned char bitten;
- register unsigned char bitoff;
+ int ci, co=1;
+ __s16 ZZvalue;
+ unsigned char bitten;
+ unsigned char bitoff;
 
 #ifdef SHOWBLOCK
 
@@ -302,10 +302,10 @@
 int RTjpeg_s2b(__s16 *data, __s8 *strm, __u8 bt8, __u32 *qtbl)
 {
  int ci;
- register int co;
- register int i;
- register unsigned char bitten;
- register unsigned char bitoff;
+ int co;
+ int i;
+ unsigned char bitten;
+ unsigned char bitoff;
 
  /* first byte always read */
  i=RTjpeg_ZZ[0];
@@ -445,8 +445,8 @@
 
 int RTjpeg_b2s(__s16 *data, __s8 *strm, __u8 bt8)
 {
- register int ci, co=1, tmp;
- register __s16 ZZvalue;
+ int ci, co=1, tmp;
+ __s16 ZZvalue;
 
 #ifdef SHOWBLOCK
 
@@ -505,7 +505,7 @@
 int RTjpeg_s2b(__s16 *data, __s8 *strm, __u8 bt8, __u32 *qtbl)
 {
  int ci=1, co=1, tmp;
- register int i;
+ int i;
 
  i=RTjpeg_ZZ[0];
  data[i]=((__u8)strm[0])*qtbl[i];
@@ -735,7 +735,7 @@
   }
 #else
   volatile mmx_t tmp6, tmp7;
-  register mmx_t *dataptr = (mmx_t *)odata;
+  mmx_t *dataptr = (mmx_t *)odata;
   mmx_t *idata2 = (mmx_t *)idata;
 
    // first copy the input 8 bit to the destination 16 bits
@@ -1573,7 +1573,7 @@
 
   mmx_t workspace[64];
   mmx_t *wsptr = workspace;
-  register mmx_t *dataptr = (mmx_t *)odata;
+  mmx_t *dataptr = (mmx_t *)odata;
   mmx_t *idata = (mmx_t *)data;
 
   rskip = rskip>>3;
@@ -2852,11 +2852,11 @@
 int RTjpeg_compressYUV420(__s8 *sp, unsigned char *bp)
 {
  __s8 * sb;
- register __u8 * bp1 = bp + (RTjpeg_width<<3);
- register __u8 * bp2 = bp + RTjpeg_Ysize;
- register __u8 * bp3 = bp2 + (RTjpeg_Csize>>1);
- register int i;
- register unsigned j, k;
+ __u8 * bp1 = bp + (RTjpeg_width<<3);
+ __u8 * bp2 = bp + RTjpeg_Ysize;
+ __u8 * bp3 = bp2 + (RTjpeg_Csize>>1);
+ int i;
+ unsigned j, k;
 
 #ifdef MMX
  emms();
@@ -2907,10 +2907,10 @@
 int RTjpeg_compressYUV422(__s8 *sp, unsigned char *bp)
 {
  __s8 * sb;
- register __u8 * bp2 = bp + RTjpeg_Ysize;
- register __u8 * bp3 = bp2 + RTjpeg_Csize;
- register int i;
- register unsigned j, k;
+ __u8 * bp2 = bp + RTjpeg_Ysize;
+ __u8 * bp3 = bp2 + RTjpeg_Csize;
+ int i;
+ unsigned j, k;
 
 #ifdef MMX
  emms();
@@ -2979,8 +2979,8 @@
 
 void RTjpeg_decompressYUV422(__s8 *sp, __u8 *bp)
 {
- register __u8 * bp2 = bp + RTjpeg_Ysize;
- register __u8 * bp3 = bp2 + (RTjpeg_Csize);
+ __u8 * bp2 = bp + RTjpeg_Ysize;
+ __u8 * bp3 = bp2 + (RTjpeg_Csize);
  int i;
  unsigned j,k;
 
@@ -3028,9 +3028,9 @@
 
 void RTjpeg_decompressYUV420(__s8 *sp, __u8 *bp)
 {
- register __u8 * bp1 = bp + (RTjpeg_width<<3);
- register __u8 * bp2 = bp + RTjpeg_Ysize;
- register __u8 * bp3 = bp2 + (RTjpeg_Csize>>1);
+ __u8 * bp1 = bp + (RTjpeg_width<<3);
+ __u8 * bp2 = bp + RTjpeg_Ysize;
+ __u8 * bp3 = bp2 + (RTjpeg_Csize>>1);
  int i;
  unsigned j,k;
 
@@ -3204,10 +3204,10 @@
 {
  __s8 * sb;
 //rh __s16 *block;
- register __u8 * bp1 = bp + (RTjpeg_width<<3);
- register __u8 * bp2 = bp + RTjpeg_Ysize;
- register __u8 * bp3 = bp2 + (RTjpeg_Csize>>1);
- register int i;
+ __u8 * bp1 = bp + (RTjpeg_width<<3);
+ __u8 * bp2 = bp + RTjpeg_Ysize;
+ __u8 * bp3 = bp2 + (RTjpeg_Csize>>1);
+ int i;
  unsigned j, k;
 
 #ifdef MMX
@@ -3297,9 +3297,9 @@
 {
  __s8 * sb;
  __s16 *_block;
- register __u8 * bp2;
- register __u8 * bp3;
- register int i;
+ __u8 * bp2;
+ __u8 * bp3;
+ int i;
  unsigned j, k;
 
 #ifdef MMX

Modified: mplayerxp/libmpcodecs/libnuppelvideo/minilzo.cpp
===================================================================
--- mplayerxp/libmpcodecs/libnuppelvideo/minilzo.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpcodecs/libnuppelvideo/minilzo.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -530,7 +530,7 @@
 #if !defined(MEMCPY8_DS)
 
 #define MEMCPY8_DS(dest,src,len) \
-    { register lzo_uint __l = (len) / 8; \
+    { lzo_uint __l = (len) / 8; \
     do { \
 	*dest++ = *src++; \
 	*dest++ = *src++; \
@@ -1202,7 +1202,7 @@
     {
 	static int x[3];
 	static unsigned xn = 3;
-	register unsigned j;
+	unsigned j;
 
 	for (j = 0; j < xn; j++)
 	    x[j] = (int)j - 3;
@@ -1560,9 +1560,9 @@
 				 lzo_voidp wrkmem )
 {
 #if 0 && defined(__GNUC__) && defined(__i386__)
-    register const lzo_byte *ip __asm__(REG_S);
+    const lzo_byte *ip __asm__(REG_S);
 #else
-    register const lzo_byte *ip;
+    const lzo_byte *ip;
 #endif
     lzo_byte *op;
     const lzo_byte * const in_end = in + in_len;
@@ -1578,9 +1578,9 @@
     for (;;)
     {
 #if 0 && defined(__GNUC__) && defined(__i386__)
-	register const lzo_byte *m_pos __asm__(REG_D);
+	const lzo_byte *m_pos __asm__(REG_D);
 #else
-	register const lzo_byte *m_pos;
+	const lzo_byte *m_pos;
 #endif
 	lzo_moff_t m_off;
 	lzo_uint m_len;
@@ -1638,7 +1638,7 @@
 		if (m_off <= M1_MAX_OFFSET && lit == 3)
 #endif
 		{
-		    register lzo_uint t;
+		    lzo_uint t;
 
 		    t = lit;
 		    assert(op - 2 > out); op[-2] |= LZO_BYTE(t);
@@ -1665,7 +1665,7 @@
 	UPDATE_I(dict,0,dindex,ip,in);
 	if (ip - ii > 0)
 	{
-	    register lzo_uint t = ip - ii;
+	    lzo_uint t = ip - ii;
 
 	    if (t <= 3)
 	    {
@@ -1676,7 +1676,7 @@
 		*op++ = LZO_BYTE(t - 3);
 	    else
 	    {
-		register lzo_uint tt = t - 18;
+		lzo_uint tt = t - 18;
 
 		*op++ = 0;
 		while (tt > 255)
@@ -1956,14 +1956,14 @@
 		       lzo_voidp wrkmem )
 #endif
 {
-    register lzo_byte *op;
-    register const lzo_byte *ip;
-    register lzo_uint t;
+    lzo_byte *op;
+    const lzo_byte *ip;
+    lzo_uint t;
 #if defined(COPY_DICT)
     lzo_uint m_off;
     const lzo_byte *dict_end;
 #else
-    register const lzo_byte *m_pos;
+    const lzo_byte *m_pos;
 #endif
 
     const lzo_byte * const ip_end = in + in_len;
@@ -2438,14 +2438,14 @@
 		       lzo_voidp wrkmem )
 #endif
 {
-    register lzo_byte *op;
-    register const lzo_byte *ip;
-    register lzo_uint t;
+    lzo_byte *op;
+    const lzo_byte *ip;
+    lzo_uint t;
 #if defined(COPY_DICT)
     lzo_uint m_off;
     const lzo_byte *dict_end;
 #else
-    register const lzo_byte *m_pos;
+    const lzo_byte *m_pos;
 #endif
 
     const lzo_byte * const ip_end = in + in_len;

Modified: mplayerxp/libmpcodecs/vd_lavc.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_lavc.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpcodecs/vd_lavc.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -518,7 +518,7 @@
 
     if(mpi) {
 	if(mpi->bpp == 8 && mpi->planes[1]) delete mpi->planes[1];
-	if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK) free_mp_image(mpi);
+	if(mpi->flags&MP_IMGFLAG_DRAW_CALLBACK) delete mpi;
     }
 
     if(pic->type!=FF_BUFFER_TYPE_USER){
@@ -603,7 +603,7 @@
 	    <<">["<<mpi->width<<"x"<<mpi->height<<"] "<<mpi->x<<" "
 	    <<mpi->y<<" "<<mpi->w<<" "<<mpi->h<<std::endl;
     __MP_ATOMIC(priv.psi.active_slices++);
-    priv.parent.draw_slice (mpi);
+    priv.parent.draw_slice (*mpi);
     mpi->xp_idx = orig_idx;
     __MP_ATOMIC(priv.psi.active_slices--);
 }
@@ -680,9 +680,9 @@
     }
     if(!(frame.flags&3) && use_slices)
     {
-	if(_mpi) free_mp_image(_mpi);
+	if(_mpi) delete _mpi;
 	_mpi=parent.get_image(MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE|MP_IMGFLAG_DRAW_CALLBACK|MP_IMGFLAG_DIRECT,sh.src_w, sh.src_h);
-	_mpi = _mpi;
+	mpi = _mpi;
 	frame_number++;
 	ctx->draw_horiz_band=draw_slice;
     }
@@ -705,7 +705,7 @@
     if(!got_picture) return NULL;	// skipped image
     if(!ctx->draw_horiz_band)
     {
-	if(_mpi) free_mp_image(_mpi);
+	if(_mpi) delete _mpi;
 	_mpi=parent.get_image(MP_IMGTYPE_EXPORT, MP_IMGFLAG_ACCEPT_STRIDE,sh.src_w,sh.src_h);
 	if(!_mpi){	// temporary!
 	    mpxp_err<<"couldn't allocate image for lavc codec"<<std::endl;

Modified: mplayerxp/libmpcodecs/vd_libmpeg2.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_libmpeg2.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpcodecs/vd_libmpeg2.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -283,7 +283,7 @@
     mpi->stride[1]=
     mpi->stride[2]=w>>1;
     mpi->flags&=~MP_IMGFLAG_DRAW_CALLBACK;
-    parent.draw_image(mpi);
+    parent.draw_image(*mpi);
 }
 
 // decode a frame

Modified: mplayerxp/libmpdemux/demux_ac3.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ac3.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpdemux/demux_ac3.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -164,7 +164,7 @@
     *brate=*samplerate=*channels=0;
     s = demuxer->stream;
     s->seek(fptr);
-    fcc=fcc1=s->read_dword();
+    fcc=fcc1=s->read(type_dword);
     fcc1=me2be_32(fcc1);
     p = (uint8_t *)&fcc1;
     s->seek(fptr);
@@ -181,7 +181,7 @@
   Stream *s;
   uint8_t *p;
   s = demuxer->stream;
-  fcc1=s->read_dword();
+  fcc1=s->read(type_dword);
   fcc1=me2be_32(fcc1);
   p = (uint8_t *)&fcc1;
   if(ac3_get_raw_id(demuxer,0,&fcc1,&fcc2,&fcc2)) return MPXP_Ok;

Modified: mplayerxp/libmpdemux/demux_aiff.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_aiff.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpdemux/demux_aiff.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -148,7 +148,7 @@
 	bp.resize(bp.size()+1);
 	bp[chunk_size]=0;
 	demuxer->info().add(INFOT_NAME, bp.cdata());
-	if(priv->verc && (chunk_size&1)) s->read_char();
+	if(priv->verc && (chunk_size&1)) s->read(type_byte);
     }
     else
     if(*((uint32_t *)&preamble[0])==mmioFOURCC('A','U','T','H'))
@@ -157,7 +157,7 @@
 	bp.resize(bp.size()+1);
 	bp[chunk_size]=0;
 	demuxer->info().add(INFOT_AUTHOR, bp.cdata());
-	if(priv->verc && (chunk_size&1)) s->read_char();
+	if(priv->verc && (chunk_size&1)) s->read(type_byte);
     }
     else
     if(*((uint32_t *)&preamble[0])==mmioFOURCC('(','c',')',' '))
@@ -166,7 +166,7 @@
 	bp.resize(bp.size()+1);
 	bp[chunk_size]=0;
 	demuxer->info().add(INFOT_COPYRIGHT, bp.cdata());
-	if(priv->verc && (chunk_size&1)) s->read_char();
+	if(priv->verc && (chunk_size&1)) s->read(type_byte);
     }
     else
     if(*((uint32_t *)&preamble[0])==mmioFOURCC('A','N','N','O'))
@@ -175,7 +175,7 @@
 	bp.resize(bp.size()+1);
 	bp[chunk_size]=0;
 	demuxer->info().add(INFOT_DESCRIPTION, bp.cdata());
-	if(priv->verc && (chunk_size&1)) s->read_char();
+	if(priv->verc && (chunk_size&1)) s->read(type_byte);
     }
     else
     {

Modified: mplayerxp/libmpdemux/demux_asf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_asf.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpdemux/demux_asf.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -512,34 +512,34 @@
 
 	    p_start=stream->tell();
 	    p_end = p_start+apriv->asf_packetsize; /* FIXME: parser is not ready for variable packet length */
-	    ecc_flags=stream->read_char(); /* read v82 header */
+	    ecc_flags=stream->read(type_byte); /* read v82 header */
 	    MSG_DBG2("ecc=%02X ecc_flags=%u\n",ecc_flags,ecc_flags&0x0F);
 	    stream->skip(ecc_flags&15);
-	    flags=stream->read_char();
-	    segtype=stream->read_char();
+	    flags=stream->read(type_byte);
+	    segtype=stream->read(type_byte);
 
 	    /* Read packet size (plen): */
 	    switch((flags>>5)&3){
-	    case 3: plen=stream->read_dword_le();break;	// dword
-	    case 2: plen=stream->read_word_le();break;	// word
-	    case 1: plen=stream->read_char();break;	// byte
+	    case 3: plen=stream->read_le(type_dword);break;	// dword
+	    case 2: plen=stream->read_le(type_word);break;	// word
+	    case 1: plen=stream->read(type_byte);break;	// byte
 	    default: plen=0; /* not present */
 //		MSG_V("Invalid plen type! assuming plen=0 (flags=%02X)\n",flags);
 	    }
 
 	    /* Read sequence: */
 	    switch((flags>>1)&3){
-	    case 3: sequence=stream->read_dword_le();break;// dword
-	    case 2: sequence=stream->read_word_le();break;	// word
-	    case 1: sequence=stream->read_char();break;	// byte
+	    case 3: sequence=stream->read_le(type_dword);break;// dword
+	    case 2: sequence=stream->read_le(type_word);break;	// word
+	    case 1: sequence=stream->read(type_byte);break;	// byte
 	    default: sequence=0;
 	    }
 
 	    /* Read padding size (padding): */
 	    switch((flags>>3)&3){
-	    case 3: padding=stream->read_dword_le();break;	// dword
-	    case 2: padding=stream->read_word_le();break;	// word
-	    case 1: padding=stream->read_char();break;	// byte
+	    case 3: padding=stream->read_le(type_dword);break;	// dword
+	    case 2: padding=stream->read_le(type_word);break;	// word
+	    case 1: padding=stream->read(type_byte);break;	// byte
 	    default: padding=0;
 	    }
 
@@ -553,12 +553,12 @@
 	    }
 
 	    // Read time & duration:
-	    time = stream->read_dword_le();
-	    duration = stream->read_word_le();
+	    time = stream->read_le(type_dword);
+	    duration = stream->read_le(type_word);
 
 	    // Read payload flags:
 	    if(flags&1){
-		unsigned char sf=stream->read_char();
+		unsigned char sf=stream->read(type_byte);
 		// multiple sub-packets
 		segsizetype=sf>>6;
 		segs=sf & 0x3F;
@@ -580,31 +580,31 @@
 
 	      if(stream->tell()>=p_end) MSG_V("Warning! invalid packet 1, sig11 coming soon...\n");
 
-	      st=stream->read_char();
+	      st=stream->read(type_byte);
 	      streamno=st&0x7F;
 	      if(st&0x80) keyframe=1;
 
 	      // Read media object number (seq):
 	      switch((segtype>>4)&3){
-	      case 3: seq=stream->read_dword_le();break;// dword
-	      case 2: seq=stream->read_word_le();break;	// word
-	      case 1: seq=stream->read_char();break;	// byte
+	      case 3: seq=stream->read_le(type_dword);break;// dword
+	      case 2: seq=stream->read_le(type_word);break;	// word
+	      case 1: seq=stream->read(type_byte);break;	// byte
 	      default: seq=0;
 	      }
 
 	      // Read offset or timestamp:
 	      switch((segtype>>2)&3){
-	      case 3: x=stream->read_dword_le();break;	// dword
-	      case 2: x=stream->read_word_le();break;	// word
-	      case 1: x=stream->read_char();break;	// byte
+	      case 3: x=stream->read_le(type_dword);break;	// dword
+	      case 2: x=stream->read_le(type_word);break;	// word
+	      case 1: x=stream->read(type_byte);break;	// byte
 	      default: x=0;
 	      }
 
 	      // Read replic.data len:
 	      switch((segtype)&3){
-	      case 3: rlen=stream->read_dword_le();break;	// dword
-	      case 2: rlen=stream->read_word_le();break;	// word
-	      case 1: rlen=stream->read_char();break;	// byte
+	      case 3: rlen=stream->read_le(type_dword);break;	// dword
+	      case 2: rlen=stream->read_le(type_word);break;	// word
+	      case 1: rlen=stream->read(type_byte);break;	// byte
 	      default: rlen=0;
 	      }
 
@@ -615,7 +615,7 @@
 	      default:
 		if(rlen>=8){
 		    stream->skip(4);// skip object size
-		    time2=stream->read_dword_le(); // read PTS
+		    time2=stream->read_le(type_dword); // read PTS
 		    stream->skip(rlen-8);
 		} else {
 		    MSG_V("unknown segment type (rlen): 0x%02X  \n",rlen);
@@ -627,9 +627,9 @@
 	      if(flags&1){
 		// multiple segments
 		switch(segsizetype){
-		  case 3: len=stream->read_dword_le();break;	// dword
-		  case 2: len=stream->read_word_le();break;	// word
-		  case 1: len=stream->read_char();break;		// byte
+		  case 3: len=stream->read_le(type_dword);break;	// dword
+		  case 2: len=stream->read_le(type_word);break;	// word
+		  case 1: len=stream->read(type_byte);break;		// byte
 		  default: len=plen-(stream->tell()-p_start); // ???
 		}
 	      } else {
@@ -645,7 +645,7 @@
 	      case 0x01:
 		// GROUPING:
 		while(len>0){
-		  int len2=stream->read_char();
+		  int len2=stream->read(type_byte);
 		  if(len2<0) len2=0;
 		  done=demux_asf_read_packet(demux,stream->tell(),len2,streamno,seq,x,duration,-1,keyframe);
 		  len-=len2+1;

Modified: mplayerxp/libmpdemux/demux_avi.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_avi.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpdemux/demux_avi.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -78,8 +78,8 @@
 }
 
 static int avi_idx_cmp(const any_t*elem1,const any_t*elem2) {
-  register off_t a = avi_idx_offset((AVIINDEXENTRY *)elem1);
-  register off_t b = avi_idx_offset((AVIINDEXENTRY *)elem2);
+  off_t a = avi_idx_offset((AVIINDEXENTRY *)elem1);
+  off_t b = avi_idx_offset((AVIINDEXENTRY *)elem2);
   return (a > b) - (b > a);
 }
 
@@ -132,7 +132,7 @@
 priv->idx_size=0;
 priv->audio_streams=0;
 while(1){
-  int id=demuxer->stream->read_dword_le();
+  int id=demuxer->stream->read_le(type_dword);
   unsigned chunksize,size2;
   static int last_fccType=0;
   const char* hdr=NULL;
@@ -141,8 +141,8 @@
   if(demuxer->stream->eof()) break;
   //
   if(id==mmioFOURCC('L','I','S','T')){
-    unsigned len=demuxer->stream->read_dword_le();   // list size
-    id=demuxer->stream->read_dword_le();             // list type
+    unsigned len=demuxer->stream->read_le(type_dword);   // list size
+    id=demuxer->stream->read_le(type_dword);             // list type
     MSG_DBG2("LIST '%.4s'  len=%u\n",(char *) &id,len);
     if(len >= 4) {
 	len -= 4;
@@ -165,7 +165,7 @@
     }
     continue;
   }
-  size2=demuxer->stream->read_dword_le();
+  size2=demuxer->stream->read_le(type_dword);
   MSG_V("CHUNK '%.4s' len=%u\n",(char *) &id,size2);
   chunksize=(size2+1)&(~1);
   infot=-1;
@@ -291,11 +291,11 @@
       chunksize-=24;
       memcpy(s->fcc, "indx", 4);
       s->dwSize = size2;
-      s->wLongsPerEntry = demuxer->stream->read_word_le();
-      s->bIndexSubType = demuxer->stream->read_char();
-      s->bIndexType = demuxer->stream->read_char();
-      s->nEntriesInUse = demuxer->stream->read_dword_le();
-      *(uint32_t *)s->dwChunkId = demuxer->stream->read_dword_le();
+      s->wLongsPerEntry = demuxer->stream->read_le(type_word);
+      s->bIndexSubType = demuxer->stream->read(type_byte);
+      s->bIndexType = demuxer->stream->read(type_byte);
+      s->nEntriesInUse = demuxer->stream->read_le(type_dword);
+      *(uint32_t *)s->dwChunkId = demuxer->stream->read_le(type_dword);
       bp=demuxer->stream->read(3*4);
       memcpy(s->dwReserved,bp.data(),bp.size());
       memset(s->dwReserved,0,3*4);
@@ -309,10 +309,10 @@
       // now the real index of indices
       for (i=0; i<s->nEntriesInUse; i++) {
 	  chunksize-=16;
-	  s->aIndex[i].qwOffset = demuxer->stream->read_dword_le() & 0xffffffff;
-	  s->aIndex[i].qwOffset |= ((uint64_t)demuxer->stream->read_dword_le() & 0xffffffff)<<32;
-	  s->aIndex[i].dwSize = demuxer->stream->read_dword_le();
-	  s->aIndex[i].dwDuration = demuxer->stream->read_dword_le();
+	  s->aIndex[i].qwOffset = demuxer->stream->read_le(type_dword) & 0xffffffff;
+	  s->aIndex[i].qwOffset |= ((uint64_t)demuxer->stream->read_le(type_dword) & 0xffffffff)<<32;
+	  s->aIndex[i].dwSize = demuxer->stream->read_le(type_dword);
+	  s->aIndex[i].dwDuration = demuxer->stream->read_le(type_dword);
 	  MSG_DBG2("ODML (%.4s): [%d] 0x%016llx 0x%04lx %ld\n",
 		  (s->dwChunkId), i,
 		  (uint64_t)s->aIndex[i].qwOffset, s->aIndex[i].dwSize, s->aIndex[i].dwDuration);
@@ -415,7 +415,7 @@
     }
     case mmioFOURCC('d', 'm', 'l', 'h'): {
 	// dmlh 00 00 00 04 frms
-	unsigned int total_frames = demuxer->stream->read_dword_le();
+	unsigned int total_frames = demuxer->stream->read_le(type_dword);
 	MSG_V("Found ODML header %lu frames %lu\n", chunksize, total_frames);
 	demuxer->stream->skip( chunksize-4);
 	chunksize = 0;
@@ -451,7 +451,7 @@
 	unsigned riff_type;
 
 	MSG_V( "additional RIFF header...\n");
-	riff_type = demuxer->stream->read_dword_le();
+	riff_type = demuxer->stream->read_le(type_dword);
 	if(riff_type != mmioFOURCC('A','V','I','X'))
 	    MSG_WARN("** warning: this is no AVIX header..\n");
 	else {
@@ -606,7 +606,7 @@
 	}
 	if (i<priv->idx_size && db) {
 	    demuxer->stream->seek( avi_idx_offset(idx));
-	    id = demuxer->stream->read_dword_le();
+	    id = demuxer->stream->read_le(type_dword);
 	    if (id && id != db) // index fcc and real fcc differ? fix it.
 		for (idx = &((AVIINDEXENTRY *)priv->idx)[0], i=0; i<priv->idx_size; i++, idx++){
 		    if (!(idx->dwFlags & AVIIF_KEYFRAME) && idx->ckid == db)
@@ -650,10 +650,10 @@
     unsigned int c;
     demuxer->filepos=demuxer->stream->tell();
     if(demuxer->filepos>=demuxer->movi_end && demuxer->movi_start<demuxer->movi_end) break;
-    id=demuxer->stream->read_dword_le();
-    len=demuxer->stream->read_dword_le();
+    id=demuxer->stream->read_le(type_dword);
+    len=demuxer->stream->read_le(type_dword);
     if(id==mmioFOURCC('L','I','S','T') || id==mmioFOURCC('R', 'I', 'F', 'F')){
-      id=demuxer->stream->read_dword_le(); // list or RIFF type
+      id=demuxer->stream->read_le(type_dword); // list or RIFF type
       continue;
     }
     if(demuxer->stream->eof()) break;
@@ -672,13 +672,13 @@
     idx->dwChunkOffset=(unsigned long)demuxer->filepos;
     idx->dwChunkLength=len;
 
-    c=demuxer->stream->read_dword();
+    c=demuxer->stream->read(type_dword);
 
     // Fix keyframes for DivX files:
     if(idxfix_divx)
       if(avi_stream_id(id)==idxfix_videostream){
 	switch(idxfix_divx){
-	    case 3: c=demuxer->stream->read_dword()<<5; //skip 32+5 bits for m$mpeg4v1
+	    case 3: c=demuxer->stream->read(type_dword)<<5; //skip 32+5 bits for m$mpeg4v1
 	    case 1: if(c&0x40000000) idx->dwFlags&=~AVIIF_KEYFRAME;break; // divx 3
 	    case 2: if(c==0x1B6) idx->dwFlags&=~AVIIF_KEYFRAME;break; // divx 4
 	}
@@ -835,7 +835,7 @@
 
   }
 
-//  len=demux->stream->read_dword_le();
+//  len=demux->stream->read_le(type_dword);
   skip=(len+1)&(~1); // total bytes in this chunk
 
   if(ds){
@@ -891,7 +891,7 @@
 #endif
     demux->stream->seek(pos);
     demux->filepos=demux->stream->tell();
-    id=demux->stream->read_dword_le();
+    id=demux->stream->read_le(type_dword);
     if(demux->stream->eof()) return 0; // EOF!
 
     if(id!=idx->ckid){
@@ -901,7 +901,7 @@
       else
 	  if(!valid_fourcc(id)) continue; // drop chunk if both id and idx bad
     }
-    len=demux->stream->read_dword_le();
+    len=demux->stream->read_le(type_dword);
 //    if((len&(~1))!=(idx->dwChunkLength&(~1))){
 //    if((len)!=(idx->dwChunkLength)){
     if((len!=idx->dwChunkLength)&&((len+1)!=idx->dwChunkLength)){
@@ -916,12 +916,12 @@
 	demux->stream->eof(1);
 	return 0;
     }
-    id=demux->stream->read_dword_le();
-    len=demux->stream->read_dword_le();
+    id=demux->stream->read_le(type_dword);
+    len=demux->stream->read_le(type_dword);
     if(demux->stream->eof()) return 0; // EOF!
 
     if(id==mmioFOURCC('L','I','S','T') || id==mmioFOURCC('R', 'I', 'F', 'F')){
-      id=demux->stream->read_dword_le(); // list or RIFF type
+      id=demux->stream->read_le(type_dword); // list or RIFF type
       continue;
     }
   }
@@ -1293,9 +1293,9 @@
 {
   uint32_t riff,id;
 
-  riff = demuxer->stream->read_dword_le();
-  demuxer->stream->read_dword_le(); /*filesize */
-  id=demuxer->stream->read_dword_le(); /* "AVI " */
+  riff = demuxer->stream->read_le(type_dword);
+  demuxer->stream->read_le(type_dword); /*filesize */
+  id=demuxer->stream->read_le(type_dword); /* "AVI " */
   demuxer->file_format=Demuxer::Type_AVI;
   if(riff == mmioFOURCC('R','I','F','F') && id == formtypeAVI) return MPXP_Ok;
   if(riff == mmioFOURCC('O','N','2',' ') && id == formtypeON2) return MPXP_Ok;

Modified: mplayerxp/libmpdemux/demux_bmp.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_bmp.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpdemux/demux_bmp.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -212,7 +212,7 @@
 // Check if a file is a BMP file depending on whether starts with 'BM'
 static MPXP_Rc bmp_probe(Demuxer *demuxer)
 {
-  if (demuxer->stream->read_word() == (('B' << 8) | 'M'))
+  if (demuxer->stream->read(type_word) == (('B' << 8) | 'M'))
     return MPXP_Ok;
   else
     return MPXP_False;
@@ -242,9 +242,9 @@
   // go back to the beginning
   demuxer->stream->reset();
   demuxer->stream->seek( demuxer->stream->start_pos()+2);
-  filesize = demuxer->stream->read_dword_le();
+  filesize = demuxer->stream->read_le(type_dword);
   demuxer->stream->skip( 4);
-  data_offset = demuxer->stream->read_word_le();
+  data_offset = demuxer->stream->read_le(type_word);
   demuxer->stream->skip( 2);
 
   // create a new video stream header
@@ -260,17 +260,17 @@
   // load the BITMAPINFOHEADER
   // allocate size and take the palette table into account
   sh_video->bih = (BITMAPINFOHEADER *)mp_malloc(data_offset - 12);
-  sh_video->bih->biSize = demuxer->stream->read_dword_le();
-  sh_video->bih->biWidth = demuxer->stream->read_dword_le();
-  sh_video->bih->biHeight = demuxer->stream->read_dword_le();
-  sh_video->bih->biPlanes = demuxer->stream->read_word_le();
-  sh_video->bih->biBitCount = demuxer->stream->read_word_le();
-  sh_video->bih->biCompression = demuxer->stream->read_dword_le();
-  sh_video->bih->biSizeImage = demuxer->stream->read_dword_le();
-  sh_video->bih->biXPelsPerMeter = demuxer->stream->read_dword_le();
-  sh_video->bih->biYPelsPerMeter = demuxer->stream->read_dword_le();
-  sh_video->bih->biClrUsed = demuxer->stream->read_dword_le();
-  sh_video->bih->biClrImportant = demuxer->stream->read_dword_le();
+  sh_video->bih->biSize = demuxer->stream->read_le(type_dword);
+  sh_video->bih->biWidth = demuxer->stream->read_le(type_dword);
+  sh_video->bih->biHeight = demuxer->stream->read_le(type_dword);
+  sh_video->bih->biPlanes = demuxer->stream->read_le(type_word);
+  sh_video->bih->biBitCount = demuxer->stream->read_le(type_word);
+  sh_video->bih->biCompression = demuxer->stream->read_le(type_dword);
+  sh_video->bih->biSizeImage = demuxer->stream->read_le(type_dword);
+  sh_video->bih->biXPelsPerMeter = demuxer->stream->read_le(type_dword);
+  sh_video->bih->biYPelsPerMeter = demuxer->stream->read_le(type_dword);
+  sh_video->bih->biClrUsed = demuxer->stream->read_le(type_dword);
+  sh_video->bih->biClrImportant = demuxer->stream->read_le(type_dword);
   // fetch the palette
   binary_packet bp=demuxer->stream->read(sh_video->bih->biClrUsed * 4);
   memcpy((unsigned char *)(sh_video->bih) + 40,bp.data(),bp.size());

Modified: mplayerxp/libmpdemux/demux_dca.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_dca.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpdemux/demux_dca.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -343,7 +343,7 @@
   *brate=*samplerate=*channels=0;
   s = demuxer->stream;
   s->seek(fptr);
-  fcc=s->read_dword();
+  fcc=s->read(type_dword);
   fcc=me2be_32(fcc);
   s->seek(fptr);
   binary_packet bp=s->read(32);
@@ -357,7 +357,7 @@
   uint32_t fcc1,fcc2;
   Stream *s;
   s = demuxer->stream;
-  fcc1=s->read_dword();
+  fcc1=s->read(type_dword);
   fcc1=me2be_32(fcc1);
   if(dca_get_raw_id(demuxer,0,&fcc1,&fcc2,&fcc2)) return MPXP_Ok;
   return MPXP_False;

Modified: mplayerxp/libmpdemux/demux_film.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_film.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpdemux/demux_film.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -244,7 +244,7 @@
 
   // get the header size, which implicitly points past the header and
   // to the start of the data
-  header_size = demuxer->stream->read_dword();
+  header_size = demuxer->stream->read(type_dword);
   film_data->film_version = demuxer->stream->read_fourcc();
   demuxer->movi_start = header_size;
   demuxer->movi_end = demuxer->stream->end_pos();
@@ -261,7 +261,7 @@
   {
     // fetch the chunk type and size
     chunk_type = demuxer->stream->read_fourcc();
-    chunk_size = demuxer->stream->read_dword();
+    chunk_size = demuxer->stream->read(type_dword);
     header_size -= chunk_size;
 
     switch (chunk_type)
@@ -279,8 +279,8 @@
 	sh_video->ds = demuxer->video;
 
 	sh_video->fourcc= video_format;
-	sh_video->src_h = demuxer->stream->read_dword();
-	sh_video->src_w = demuxer->stream->read_dword();
+	sh_video->src_h = demuxer->stream->read(type_dword);
+	sh_video->src_w = demuxer->stream->read(type_dword);
 	MSG_V(
 	  "  FILM video: %d x %d\n", sh_video->src_w,
 	  sh_video->src_h);
@@ -303,7 +303,7 @@
       // don't do this if the file is a quirky file with NULL version
       if (film_data->film_version)
       {
-	audio_channels = demuxer->stream->read_char();
+	audio_channels = demuxer->stream->read(type_byte);
 	if (audio_channels > 0)
 	{
 	  // create and initialize the audio stream header
@@ -317,9 +317,9 @@
 	  sh_audio->wf->wFormatTag = 1;
 	  sh_audio->wtag = 1;
 	  sh_audio->wf->nChannels = audio_channels;
-	  sh_audio->wf->wBitsPerSample = demuxer->stream->read_char();
+	  sh_audio->wf->wBitsPerSample = demuxer->stream->read(type_byte);
 	  demuxer->stream->skip( 1);  // skip unknown byte
-	  sh_audio->wf->nSamplesPerSec = demuxer->stream->read_word();
+	  sh_audio->wf->nSamplesPerSec = demuxer->stream->read(type_word);
 	  sh_audio->wf->nAvgBytesPerSec =
 	    sh_audio->wf->nSamplesPerSec * sh_audio->wf->wBitsPerSample
 	    * sh_audio->wf->nChannels / 8;
@@ -366,11 +366,11 @@
 
       if (sh_video)
       {
-	sh_video->fps = demuxer->stream->read_dword();
+	sh_video->fps = demuxer->stream->read(type_dword);
       }
 
       // fetch the number of chunks
-      film_data->total_chunks = demuxer->stream->read_dword();
+      film_data->total_chunks = demuxer->stream->read(type_dword);
       film_data->current_chunk = 0;
       MSG_V(
 	"  STAB chunk contains %d chunks\n", film_data->total_chunks);
@@ -384,10 +384,10 @@
       {
 	film_chunk = film_data->chunks[i];
 	film_chunk.chunk_offset =
-	  demuxer->movi_start + demuxer->stream->read_dword();
-	film_chunk.chunk_size = demuxer->stream->read_dword();
-	film_chunk.syncinfo1 = demuxer->stream->read_dword();
-	film_chunk.syncinfo2 = demuxer->stream->read_dword();
+	  demuxer->movi_start + demuxer->stream->read(type_dword);
+	film_chunk.chunk_size = demuxer->stream->read(type_dword);
+	film_chunk.syncinfo1 = demuxer->stream->read(type_dword);
+	film_chunk.syncinfo2 = demuxer->stream->read(type_dword);
 
 	// count chunks for the purposes of seeking
 	if (counting_chunks)

Modified: mplayerxp/libmpdemux/demux_flac.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_flac.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpdemux/demux_flac.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -50,7 +50,7 @@
   *brate=*samplerate=*channels=0;
   s = demuxer->stream;
   s->seek(fptr);
-  fcc1=s->read_dword();
+  fcc1=s->read(type_dword);
   fcc1=me2be_32(fcc1);
   s->seek(fptr);
   binary_packet bp=s->read(32);
@@ -70,7 +70,7 @@
   Stream *s;
   uint8_t *p;
   s = demuxer->stream;
-  fcc1=s->read_dword();
+  fcc1=s->read(type_dword);
   fcc1=me2be_32(fcc1);
   p = (uint8_t *)&fcc1;
   if(flac_get_raw_id(demuxer,0,&fcc1,&fcc2,&fcc2)) return MPXP_Ok;

Modified: mplayerxp/libmpdemux/demux_fli.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_fli.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpdemux/demux_fli.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -78,7 +78,7 @@
 static MPXP_Rc fli_probe(Demuxer* demuxer){
   unsigned magic_number;
   demuxer->movi_end = demuxer->stream->skip(4);
-  magic_number = demuxer->stream->read_word_le();
+  magic_number = demuxer->stream->read_le(type_word);
   if ((magic_number != 0xAF11) && (magic_number != 0xAF12)) return MPXP_False;
   demuxer->file_format=Demuxer::Type_FLI;
   return MPXP_Ok;
@@ -103,9 +103,9 @@
   demuxer->stream->seek( 0);
 
   demuxer->movi_start = 128;
-  demuxer->movi_end = demuxer->stream->read_dword_le();
+  demuxer->movi_end = demuxer->stream->read_le(type_dword);
 
-  magic_number = demuxer->stream->read_word_le();
+  magic_number = demuxer->stream->read_le(type_word);
 
   if ((magic_number != 0xAF11) && (magic_number != 0xAF12))
   {
@@ -117,7 +117,7 @@
   }
 
   // fetch the number of frames
-  frames->num_frames = demuxer->stream->read_word_le();
+  frames->num_frames = demuxer->stream->read_le(type_word);
   frames->current_frame = 0;
 
   // allocate enough entries for the indices
@@ -139,8 +139,8 @@
   // custom fourcc for internal MPlayer use
   sh_video->fourcc = mmioFOURCC('F', 'L', 'I', 'C');
 
-  sh_video->src_w = demuxer->stream->read_word_le();
-  sh_video->src_h = demuxer->stream->read_word_le();
+  sh_video->src_w = demuxer->stream->read_le(type_word);
+  sh_video->src_h = demuxer->stream->read_le(type_word);
 
   // pass extradata to codec
   sh_video->bih = (BITMAPINFOHEADER*)header;
@@ -155,7 +155,7 @@
   demuxer->stream->skip( 4);
 
   // get the speed
-  speed = demuxer->stream->read_word_le();
+  speed = demuxer->stream->read_le(type_word);
   if (speed == 0)
     speed = 1;
   if (magic_number == 0xAF11)
@@ -168,8 +168,8 @@
   while ((!demuxer->stream->eof()) && (frame_number < frames->num_frames))
   {
     frames->filepos[frame_number] = demuxer->stream->tell();
-    frame_size = demuxer->stream->read_dword_le();
-    magic_number = demuxer->stream->read_word_le();
+    frame_size = demuxer->stream->read_le(type_dword);
+    magic_number = demuxer->stream->read_le(type_word);
     demuxer->stream->skip( frame_size - 6);
 
     // if this chunk has the right magic number, index it

Modified: mplayerxp/libmpdemux/demux_mkv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpdemux/demux_mkv.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -118,14 +118,14 @@
   int i, len_mask = 0x80;
   uint32_t id;
 
-  for (i=0, id=s->read_char(); i<4 && !(id & len_mask); i++)
+  for (i=0, id=s->read(type_byte); i<4 && !(id & len_mask); i++)
     len_mask >>= 1;
   if (i >= 4)
     return EBML_ID_INVALID;
   if (length)
     *length = i + 1;
   while (i--)
-    id = (id << 8) | s->read_char();
+    id = (id << 8) | s->read(type_byte);
   return id;
 }
 
@@ -186,7 +186,7 @@
   int i, j, num_ffs = 0, len_mask = 0x80;
   uint64_t len;
 
-  for (i=0, len=s->read_char(); i<8 && !(len & len_mask); i++)
+  for (i=0, len=s->read(type_byte); i<8 && !(len & len_mask); i++)
     len_mask >>= 1;
   if (i >= 8)
     return EBML_UINT_INVALID;
@@ -197,7 +197,7 @@
     num_ffs++;
   while (i--)
     {
-      len = (len << 8) | s->read_char();
+      len = (len << 8) | s->read(type_byte);
       if ((len & 0xFF) == 0xFF)
 	num_ffs++;
     }
@@ -222,7 +222,7 @@
     *length = len + l;
 
   while (len--)
-    value = (value << 8) | s->read_char();
+    value = (value << 8) | s->read(type_byte);
 
   return value;
 }
@@ -244,12 +244,12 @@
     *length = len + l;
 
   len--;
-  l = s->read_char();
+  l = s->read(type_byte);
   if (l & 0x80)
     value = -1;
   value = (value << 8) | l;
   while (len--)
-    value = (value << 8) | s->read_char();
+    value = (value << 8) | s->read(type_byte);
 
   return value;
 }
@@ -270,7 +270,7 @@
     case 4:
       {
 	union {uint32_t i; float f;} u;
-	u.i = s->read_dword();
+	u.i = s->read(type_dword);
 	value = u.f;
 	break;
       }
@@ -278,7 +278,7 @@
     case 8:
       {
 	union {uint64_t i; double d;} u;
-	u.i = s->read_qword();
+	u.i = s->read(type_qword);
 	value = u.d;
 	break;
       }

Modified: mplayerxp/libmpdemux/demux_mov.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mov.cpp	2013-06-11 17:36:43 UTC (rev 652)
+++ mplayerxp/libmpdemux/demux_mov.cpp	2013-06-12 14:05:09 UTC (rev 653)
@@ -338,17 +338,17 @@
     while(1){
 	int i;
 	int skipped=8;
-	off_t len=demuxer->stream->read_dword();
-	unsigned int id=demuxer->stream->read_dword();
+	off_t len=demuxer->stream->read(type_dword);
+	unsigned int id=demuxer->stream->read(type_dword);
 	if(demuxer->stream->eof()) break; // EOF
 	if (len == 1) /* real size is 64bits - cjb */
 	{
 #ifndef _LARGEFILE_SOURCE
-	    if (demuxer->stream->read_dword() != 0)
+	    if (demuxer->stream->read(type_dword) != 0)
 		MSG_WARN( "64bit file, but you've compiled MPlayer without LARGEFILE support!\n");
-	    len = demuxer->stream->read_dword();
+	    len = demuxer->stream->read(type_dword);
 #else
-	    len = demuxer->stream->read_qword();
+	    len = demuxer->stream->read(type_qword);
 #endif
 	    skipped += 8;
 	}
@@ -370,7 +370,7 @@
 	  // char[4]  compatible_brands[]  (eg. 'mp41')
 	  // compatible_brands list spans to the end of box
 #if 1
-	  tmp = demuxer->stream->read_dword();
+	  tmp = demuxer->stream->read(type_dword);
 	  switch(tmp) {
 	    case MOV_FOURCC('i','s','o','m'):
 	      MSG_V("MOV: File-Type Major-Brand: ISO Media File\n");
@@ -413,12 +413,12 @@
 	      tmp = BE_32(tmp);
 	      MSG_WARN("MOV: File-Type unknown Major-Brand: %.4s\n",&tmp);
 	  }
-	  ver=demuxer->stream->read_dword();
+	  ver=demuxer->stream->read(type_dword);
 	  MSG_V("MOV: File-Type Minor-Version: %d\n",ver);
 	  skipped += 8;
 	  // List all compatible brands
 	  for(i = 0; i < ((len-16)/4); i++) {
-	    tmp = BE_32(demuxer->stream->read_dword());
+	    tmp = BE_32(demuxer->stream->read(type_dword));
 	    MSG_V("MOV: File-Type Compatible-Brands #%d: %.4s\n",i,&tmp);
 	    skipped += 4;
 	  }
@@ -432,24 +432,24 @@
 	  MSG_DBG2("MOV: Movie header: start: %x end: %x\n",
 	    priv->moov_start, priv->moov_end);
 	  skipped+=8;
-	  i = demuxer->stream->read_dword()-8;
-	  if(demuxer->stream->read_dword()==MOV_FOURCC('r','m','r','a')){
+	  i = demuxer->stream->read(type_dword)-8;
+	  if(demuxer->stream->read(type_dword)==MOV_FOURCC('r','m','r','a')){
 	      skipped+=i;
 	      MSG_V("MOV: Reference Media file!!!\n");
 	      //set demuxer type to playlist ...
 	      //demuxer->type=DEMUXER_TYPE_PLAYLIST;
 	      while(i>0){
-		  int len=demuxer->stream->read_dword()-8;
-		  int fcc=demuxer->stream->read_dword();
+		  int len=demuxer->stream->read(type_dword)-8;
+		  int fcc=demuxer->stream->read(type_dword);
 		  if(len<0) break; // EOF!?
 		  i-=8;
 		  switch(fcc){
 		  case MOV_FOURCC('r','m','d','a'):
 		      continue;
 		  case MOV_FOURCC('r','d','r','f'): {
-		      demuxer->stream->read_dword();
-		      /*int type=*/demuxer->stream->read_dword_le();
-		      int slen=demuxer->stream->read_dword();
+		      demuxer->stream->read(type_dword);
+		      /*int type=*/demuxer->stream->read_le(type_dword);
+		      int slen=demuxer->stream->read(type_dword);
 		      //char* s=mp_malloc(slen+1);
 		      //demuxer->stream->read(s,slen);
 
@@ -467,13 +467,13 @@
 		      len-=12+slen;i-=12+slen; break;
 		    }
 		  case MOV_FOURCC('r','m','d','r'): {
-		      demuxer->stream->read_dword();
-		      int rate=demuxer->stream->read_dword();
+		      demuxer->stream->read(type_dword);
+		      int rate=demuxer->stream->read(type_dword);
 		      MSG_V("  min. data rate: %d bits/sec\n",rate);
 		      len-=8; i-=8; break;
 		    }
 		  case MOV_FOURCC('r','m','q','u'): {
-		      int q=demuxer->stream->read_dword();
+		      int q=demuxer->stream->read(type_dword);
 		      MSG_V("  quality index: %d\n",q);
 		      len-=4; i-=4; break;
 		    }
@@ -608,10 +608,10 @@
 	//
 	pos=demuxer->stream->tell();
 	if(pos>=endpos) return; // END
-	len=demuxer->stream->read_dword();
+	len=demuxer->stream->read(type_dword);
 	if(len<8) return; // error
 	len-=8;
-	id=demuxer->stream->read_dword();
+	id=demuxer->stream->read(type_dword);
 	//
 	MSG_DBG2("lschunks %.4s  %d\n",&id,(int)len);
 	//
@@ -621,13 +621,13 @@
 	} else { /* not in track */
 	  switch(id) {
 	    case MOV_FOURCC('m','v','h','d'): {
-		int version = demuxer->stream->read_char();
+		int version = demuxer->stream->read(type_byte);
 		demuxer->stream->skip( (version == 1) ? 19 : 11);
-		priv->timescale=demuxer->stream->read_dword();
+		priv->timescale=demuxer->stream->read(type_dword);
 		if (version == 1)
-		    priv->duration=demuxer->stream->read_qword();
+		    priv->duration=demuxer->stream->read(type_qword);
 		else
-		    priv->duration=demuxer->stream->read_dword();
+		    priv->duration=demuxer->stream->read(type_dword);
 		MSG_V("MOV: %*sMovie header (%d bytes): tscale=%d  dur=%d\n",level,"",(int)len,
 		    (int)priv->timescale,(int)priv->duration);
 		break;
@@ -1316,14 +1316,14 @@
 	    break;
 	}
 	case MOV_FOURCC('d','c','o','m'): {
-//	    int temp=demuxer->stream->read_dword();
-	    unsigned int algo=be2me_32(demuxer->stream->read_dword());
+//	    int temp=demuxer->stream->read(type_dword);
+	    unsigned int algo=be2me_32(demuxer->stream->read(type_dword));
 	    MSG_V( "Compressed header uses %.4s algo!\n",&algo);
 	    break;
 	}
 	case MOV_FOURCC('c','m','v','d'): {
-//	    int temp=demuxer->stream->read_dword();
-	    unsigned int moov_sz=demuxer->stream->read_dword();
+//	    int temp=demuxer->stream->read(type_dword);
+	    unsigned int moov_sz=demuxer->stream->read(type_dword);
 	    unsigned int cmov_sz=len-4;
 	    unsigned char* cmov_buf=new unsigned char[cmov_sz];
 	    unsigned char* moov_buf=new unsigned char[moov_sz+16];
@@ -1383,8 +1383,8 @@
 
 	    while((len > 8) && (udta_size > 8))
 	    {
-		udta_len = demuxer->stream->read_dword();
-		udta_id = demuxer->stream->read_dword();
+		udta_len = demuxer->stream->read(type_dword);
+		udta_id = demuxer->stream->read(type_dword);
 		udta_size -= 8;
 		MSG_DBG2( "udta_id: %.4s (len: %d)\n", &udta_id, udta_len);
 		switch (udta_id)
@@ -1406,7 +1406,7 @@
 		    case MOV_FOURCC(0xa9,'a','u','t'):
 		    case MOV_FOURCC(0xa9,'s','w','r'):
 		    {
-			off_t text_len = demuxer->stream->read_word();
+			off_t text_len = demuxer->stream->read(type_word);
 			char text[text_len+2+1];
 			bp=demuxer->stream->read(text_len+2);
 			memcpy(&text,bp.data(),bp.size());
@@ -1542,26 +1542,26 @@
       break;
     }
     case MOV_FOURCC('m','d','h','d'): {
-      int version = demuxer->stream->read_char();
+      int version = demuxer->stream->read(type_byte);
       MSG_V("MOV: %*sMedia header!\n", level, "");
       demuxer->stream->skip( (version == 1) ? 19 : 11);
       // read timescale
-      trak->timescale = demuxer->stream->read_dword();
+      trak->timescale = demuxer->stream->read(type_dword);
       // read length
       if (version == 1)
-	  trak->length = demuxer->stream->read_qword();
+	  trak->length = demuxer->stream->read(type_qword);
       else
-	  trak->length = demuxer->stream->read_dword();
+	  trak->length = demuxer->stream->read(type_dword);
       break;
     }
     case MOV_FOURCC('h','d','l','r'): {
-      demuxer->stream->read_dword();
-      unsigned int type = demuxer->stream->read_dword_le();
-      unsigned int subtype = demuxer->stream->read_dword_le();
-      unsigned int manufact = demuxer->stream->read_dword_le();
-      /*unsigned int comp_flags =*/ demuxer->stream->read_dword();
-      /*unsigned int comp_mask =*/ demuxer->stream->read_dword();
-      unsigned _len = demuxer->stream->read_char();
+      demuxer->stream->read(type_dword);
+      unsigned int type = demuxer->stream->read_le(type_dword);
+      unsigned int subtype = demuxer->stream->read_le(type_dword);
+      unsigned int manufact = demuxer->stream->read_le(type_dword);
+      /*unsigned int comp_flags =*/ demuxer->stream->read(type_dword);
+      /*unsigned int comp_mask =*/ demuxer->stream->read(type_dword);
+      unsigned _len = demuxer->stream->read(type_byte);
       char* str = new char [_len + 1];
       bp=demuxer->stream->read(_len);
       memcpy(str,bp.data(),bp.size());
@@ -1605,14 +1605,14 @@
       break;
     }
     case MOV_FOURCC('s','t','s','d'): {
-      int i = demuxer->stream->read_dword(); // temp!
-      int count = demuxer->stream->read_dword();
+      int i = demuxer->stream->read(type_dword); // temp!
+      int count = demuxer->stream->read(type_dword);
       MSG_V( "MOV: %*sDescription list! (cnt:%d)\n",
 	     level, "", count);
       for (i = 0; i < count; i++) {
 	off_t _pos = demuxer->stream->tell();
-	unsigned _len = demuxer->stream->read_dword();
-	unsigned int fourcc = demuxer->stream->read_dword_le();
+	unsigned _len = demuxer->stream->read(type_dword);
+	unsigned int fourcc = demuxer->stream->read_le(type_dword);
 	/* some files created with Broadcast 2000 (e.g. ilacetest.mov)
 	   contain raw I420 video but have a yv12 fourcc */
 	if (fourcc == mmioFOURCC('y','v','1','2'))
@@ -1639,15 +1639,15 @@
       break;
     }
     case MOV_FOURCC('s','t','t','s'): {
-      demuxer->stream->read_dword();
-      unsigned i,_len = demuxer->stream->read_dword();
+      demuxer->stream->read(type_dword);
+      unsigned i,_len = demuxer->stream->read(type_dword);
       unsigned int pts = 0;
       MSG_V("MOV: %*sSample duration table! (%d blocks)\n", level, "", _len);
       trak->durmap = new mov_durmap_t[_len];
       trak->durmap_size = _len;
       for (i = 0; i < _len; i++) {
-	trak->durmap[i].num = demuxer->stream->read_dword();
-	trak->durmap[i].dur = demuxer->stream->read_dword();
+	trak->durmap[i].num = demuxer->stream->read(type_dword);
+	trak->durmap[i].dur = demuxer->stream->read(type_dword);
 	pts += trak->durmap[i].num * trak->durmap[i].dur;
       }
       if (trak->length != pts)
@@ -1655,8 +1655,8 @@
       break;
     }
     case MOV_FOURCC('s','t','s','c'): {
-      unsigned temp = demuxer->stream->read_dword();
-      unsigned i,_len = demuxer->stream->read_dword();
+      unsigned temp = demuxer->stream->read(type_dword);
+      unsigned i,_len = demuxer->stream->read(type_dword);
       unsigned ver = (temp << 24);
       unsigned flags = (temp << 16) | (temp << 8) | temp;
       MSG_V( "MOV: %*sSample->Chunk mapping table!  (%d blocks) (ver:%d,flags:%ld)\n", level, "",
@@ -1665,18 +1665,18 @@
       trak->chunkmap_size = _len;
       trak->chunkmap = new mov_chunkmap_t[_len];
       for (i = 0; i < _len; i++) {
-	trak->chunkmap[i].first = demuxer->stream->read_dword() - 1;
-	trak->chunkmap[i].spc = demuxer->stream->read_dword();
-	trak->chunkmap[i].sdid = demuxer->stream->read_dword();
+	trak->chunkmap[i].first = demuxer->stream->read(type_dword) - 1;
+	trak->chunkmap[i].spc = demuxer->stream->read(type_dword);
+	trak->chunkmap[i].sdid = demuxer->stream->read(type_dword);
       }
       break;
     }
     case MOV_FOURCC('s','t','s','z'): {
-      int temp = demuxer->stream->read_dword();
-      int ss=demuxer->stream->read_dword();
+      int temp = demuxer->stream->read(type_dword);
+      int ss=demuxer->stream->read(type_dword);
       int ver = (temp << 24);
       int flags = (temp << 16) | (temp << 8) | temp;
-      int entries = demuxer->stream->read_dword();
+      int entries = demuxer->stream->read(type_dword);
       int i;
       MSG_V("MOV: %*sSample size table! (entries=%d ss=%d) (ver:%d,flags:%ld)\n", level, "",
 	     entries, ss, ver, flags);
@@ -1688,13 +1688,13 @@
 		(mov_sample_t*)mp_calloc(entries, sizeof(mov_sample_t));
 	trak->samples_size = entries;
 	for (i = 0; i < entries; i++)
-	  trak->samples[i].size = demuxer->stream->read_dword();
+	  trak->samples[i].size = demuxer->stream->read(type_dword);
       }
       break;
     }
     case MOV_FOURCC('s','t','c','o'): {
-      demuxer->stream->read_dword();
-      unsigned i,_len = demuxer->stream->read_dword();
+      demuxer->stream->read(type_dword);
+      unsigned i,_len = demuxer->stream->read(type_dword);
       MSG_V( "MOV: %*sChunk offset table! (%d chunks)\n", level, "",
 	     _len);
       // extend array if needed:
@@ -1706,12 +1706,12 @@
       }
       // read elements:
       for(i = 0; i < _len; i++)
-	trak->chunks[i].pos = demuxer->stream->read_dword();
+	trak->chunks[i].pos = demuxer->stream->read(type_dword);
       break;
     }
     case MOV_FOURCC('c','o','6','4'): {
-      demuxer->stream->read_dword();
-      unsigned i,_len = demuxer->stream->read_dword();
+      demuxer->stream->read(type_dword);
+      unsigned i,_len = demuxer->stream->read(type_dword);
       MSG_V( "MOV: %*s64bit chunk offset table! (%d chunks)\n", level, "",
 	     _len);
       // extend array if needed:
@@ -1724,18 +1724,18 @@
       // read elements:
       for (i = 0; i < _len; i++) {
 #ifndef	_LARGEFILE_SOURCE
-	if (demuxer->stream->read_dword() != 0)
+	if (demuxer->stream->read(type_dword) != 0)
 	  MSG_WARN( "Chunk %d has got 64bit address, but you'...
 
[truncated message content]