comparison libmpdemux/demux_mf.c @ 25034:6cde6c8094da

Remove a pointless #ifdef
author reimar
date Sat, 17 Nov 2007 17:28:33 +0000
parents 3dceb6c96307
children 25ee4d06a2df
comparison
equal deleted inserted replaced
25033:3dceb6c96307 25034:6cde6c8094da
39 if ( mf->curr_frame >= mf->nr_of_files ) return 0; 39 if ( mf->curr_frame >= mf->nr_of_files ) return 0;
40 40
41 stat( mf->names[mf->curr_frame],&fs ); 41 stat( mf->names[mf->curr_frame],&fs );
42 // printf( "[demux_mf] frame: %d (%s,%d)\n",mf->curr_frame,mf->names[mf->curr_frame],fs.st_size ); 42 // printf( "[demux_mf] frame: %d (%s,%d)\n",mf->curr_frame,mf->names[mf->curr_frame],fs.st_size );
43 43
44 #ifdef WIN32
45 if ( !( f=fopen( mf->names[mf->curr_frame],"rb" ) ) ) return 0; 44 if ( !( f=fopen( mf->names[mf->curr_frame],"rb" ) ) ) return 0;
46 #else
47 if ( !( f=fopen( mf->names[mf->curr_frame],"r" ) ) ) return 0;
48 #endif
49 { 45 {
50 sh_video_t * sh_video = demuxer->video->sh; 46 sh_video_t * sh_video = demuxer->video->sh;
51 demux_packet_t * dp = new_demux_packet( fs.st_size ); 47 demux_packet_t * dp = new_demux_packet( fs.st_size );
52 if ( !fread( dp->buffer,fs.st_size,1,f ) ) return 0; 48 if ( !fread( dp->buffer,fs.st_size,1,f ) ) return 0;
53 dp->pts=mf->curr_frame / sh_video->fps; 49 dp->pts=mf->curr_frame / sh_video->fps;