Mercurial > mplayer.hg
changeset 30578:1cb4281551e2
libmpdemux: Remove pointless leftover '#if 1' preprocessor instructions.
| author | diego |
|---|---|
| date | Wed, 17 Feb 2010 22:52:31 +0000 |
| parents | 737b7fd47ef4 |
| children | 7c6145c57bda |
| files | libmpdemux/demux_mpg.c libmpdemux/demux_real.c libmpdemux/mp3_hdr.c |
| diffstat | 3 files changed, 0 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/demux_mpg.c Wed Feb 17 22:48:32 2010 +0000 +++ b/libmpdemux/demux_mpg.c Wed Feb 17 22:52:31 2010 +0000 @@ -824,11 +824,9 @@ // 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...
--- a/libmpdemux/demux_real.c Wed Feb 17 22:48:32 2010 +0000 +++ b/libmpdemux/demux_real.c Wed Feb 17 22:52:31 2010 +0000 @@ -496,7 +496,6 @@ 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 @@ } 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;
--- a/libmpdemux/mp3_hdr.c Wed Feb 17 22:48:32 2010 +0000 +++ b/libmpdemux/mp3_hdr.c Wed Feb 17 22:52:31 2010 +0000 @@ -65,13 +65,11 @@ // 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){