diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 22:52:31 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-17 22:52:31 +0000 |
| commit | 2d776c8c768349798412a6121e581a3078fff4e6 (patch) | |
| tree | e535fa7c58f9daafbd39fbf37133a63fb2471441 /libmpdemux | |
| parent | c66aa21366043b81d263e453dda28ac50d573114 (diff) | |
| download | mpv-2d776c8c768349798412a6121e581a3078fff4e6.tar.bz2 mpv-2d776c8c768349798412a6121e581a3078fff4e6.tar.xz | |
libmpdemux: Remove pointless leftover '#if 1' preprocessor instructions.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30620 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_mpg.c | 2 | ||||
| -rw-r--r-- | libmpdemux/demux_real.c | 2 | ||||
| -rw-r--r-- | libmpdemux/mp3_hdr.c | 2 |
3 files changed, 0 insertions, 6 deletions
diff --git a/libmpdemux/demux_mpg.c b/libmpdemux/demux_mpg.c index d37971b44a..f6c7fc5169 100644 --- a/libmpdemux/demux_mpg.c +++ b/libmpdemux/demux_mpg.c @@ -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... diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c index 78a404b826..45ee5efdd4 100644 --- a/libmpdemux/demux_real.c +++ b/libmpdemux/demux_real.c @@ -496,7 +496,6 @@ double real_fix_timestamp(unsigned char *buf, unsigned int timestamp, unsigned i 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 *buf, unsigned int timestamp, unsigned i } 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; diff --git a/libmpdemux/mp3_hdr.c b/libmpdemux/mp3_hdr.c index ee7d8211df..d2520f1d8d 100644 --- a/libmpdemux/mp3_hdr.c +++ b/libmpdemux/mp3_hdr.c @@ -65,13 +65,11 @@ int mp_get_mp3_header(unsigned char* hbuf,int* chans, int* srate, int* spf, int* // 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){ |