[MPlayer-cvslog] r30620 - in trunk/libmpdemux: demux_mpg.c demux_real.c mp3_hdr.c

[diego]

Author: diego
Date: Wed Feb 17 23:52:31 2010
New Revision: 30620

Log:
libmpdemux: Remove pointless leftover '#if 1' preprocessor instructions.

Modified:
   trunk/libmpdemux/demux_mpg.c
   trunk/libmpdemux/demux_real.c
   trunk/libmpdemux/mp3_hdr.c

Modified: trunk/libmpdemux/demux_mpg.c
==============================================================================
--- trunk/libmpdemux/demux_mpg.c	Wed Feb 17 23:48:32 2010	(r30619)
+++ trunk/libmpdemux/demux_mpg.c	Wed Feb 17 23:52:31 2010	(r30620)
@@ -824,11 +824,9 @@ int ret=0;
 // System stream
 do{
   demux->filepos=stream_tell(demux->stream);
-#if 1
   //lame workaround: this is needed to show the progress bar when playing dvdnav://
   //(ths poor guy doesn't know teh length of the stream at startup)
   demux->movi_end = demux->stream->end_pos;
-#endif
   head=stream_read_dword(demux->stream);
   if((head&0xFFFFFF00)!=0x100){
    // sync...

Modified: trunk/libmpdemux/demux_real.c
==============================================================================
--- trunk/libmpdemux/demux_real.c	Wed Feb 17 23:48:32 2010	(r30619)
+++ trunk/libmpdemux/demux_real.c	Wed Feb 17 23:52:31 2010	(r30620)
@@ -496,7 +496,6 @@ double real_fix_timestamp(unsigned char 
   int pict_type;
   unsigned int orig_kf;
 
-#if 1
   if(format==mmioFOURCC('R','V','3','0') || format==mmioFOURCC('R','V','4','0')){
     if(format==mmioFOURCC('R','V','3','0')){
       SKIP_BITS(3);
@@ -531,7 +530,6 @@ double real_fix_timestamp(unsigned char 
     }
     mp_msg(MSGT_DEMUX, MSGL_DBG2,"\nTS: %08X -> %08X (%04X) %d %02X %02X %02X %02X %5u\n",timestamp,kf,orig_kf,pict_type,s[0],s[1],s[2],s[3],pts?kf-(unsigned int)(*pts*1000.0):0);
   }
-#endif
     v_pts=kf*0.001f;
 //    if(pts && (v_pts<*pts || !kf)) v_pts=*pts+frametime;
     if(pts) *pts=v_pts;

Modified: trunk/libmpdemux/mp3_hdr.c
==============================================================================
--- trunk/libmpdemux/mp3_hdr.c	Wed Feb 17 23:48:32 2010	(r30619)
+++ trunk/libmpdemux/mp3_hdr.c	Wed Feb 17 23:52:31 2010	(r30620)
@@ -65,13 +65,11 @@ int mp_get_mp3_header(unsigned char* hbu
 
 //    printf("head=0x%08X\n",newhead);
 
-#if 1
     // head_check:
     if( (newhead & 0xffe00000) != 0xffe00000 ){
 	mp_msg(MSGT_DEMUXER,MSGL_DBG2,"head_check failed\n");
 	return -1;
     }
-#endif
 
     layer = 4-((newhead>>17)&3);
     if(layer==4){