Mercurial > mplayer.hg
comparison libmpdemux/video.c @ 9693:1d598bf65571
10l, found by Jan Kritzner <kritzner@informatik.rwth-aachen.de>
author | alex |
---|---|
date | Wed, 26 Mar 2003 15:49:10 +0000 |
parents | 76c6d8f1ebf5 |
children | 39b68c2664ec |
comparison
equal
deleted
inserted
replaced
9692:148281a4e77b | 9693:1d598bf65571 |
---|---|
389 | 389 |
390 frame_time*=sh_video->frametime; | 390 frame_time*=sh_video->frametime; |
391 | 391 |
392 // override frame_time for variable/unknown FPS formats: | 392 // override frame_time for variable/unknown FPS formats: |
393 if(!force_fps) switch(demuxer->file_format){ | 393 if(!force_fps) switch(demuxer->file_format){ |
394 case DEMUXER_TYPE_GIF: | |
394 case DEMUXER_TYPE_REAL: | 395 case DEMUXER_TYPE_REAL: |
395 if(d_video->pts>0 && pts1>0 && d_video->pts>pts1) | 396 if(d_video->pts>0 && pts1>0 && d_video->pts>pts1) |
396 frame_time=d_video->pts-pts1; | 397 frame_time=d_video->pts-pts1; |
397 break; | 398 break; |
398 #ifdef USE_TV | 399 #ifdef USE_TV |
415 } else { | 416 } else { |
416 mp_msg(MSGT_CPLAYER,MSGL_WARN,"\nInvalid frame duration value (%5.3f/%5.3f => %5.3f). Defaulting to %5.3f sec.\n",d_video->pts,next_pts,d,frame_time); | 417 mp_msg(MSGT_CPLAYER,MSGL_WARN,"\nInvalid frame duration value (%5.3f/%5.3f => %5.3f). Defaulting to %5.3f sec.\n",d_video->pts,next_pts,d,frame_time); |
417 // frame_time = 1/25.0; | 418 // frame_time = 1/25.0; |
418 } | 419 } |
419 } | 420 } |
420 case DEMUXER_TYPE_GIF: | 421 break; |
421 frame_time=d_video->pts-pts1; | |
422 break; | |
423 } | 422 } |
424 | 423 |
425 if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS || | 424 if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS || |
426 demuxer->file_format==DEMUXER_TYPE_MPEG_TS || | 425 demuxer->file_format==DEMUXER_TYPE_MPEG_TS || |
427 demuxer->file_format==DEMUXER_TYPE_MPEG_ES){ | 426 demuxer->file_format==DEMUXER_TYPE_MPEG_ES){ |