Mercurial > mplayer.hg
comparison libmpdemux/video.c @ 12170:8db1b587d16a
lavf ASF support
| author | michael |
|---|---|
| date | Sun, 11 Apr 2004 19:03:12 +0000 |
| parents | aa8807bd062d |
| children | 7ac60a1c576e |
comparison
equal
deleted
inserted
replaced
| 12169:71c49bf6dcac | 12170:8db1b587d16a |
|---|---|
| 480 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); | 480 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); |
| 481 // frame_time = 1/25.0; | 481 // frame_time = 1/25.0; |
| 482 } | 482 } |
| 483 } | 483 } |
| 484 break; | 484 break; |
| 485 case DEMUXER_TYPE_LAVF: | |
| 486 if((int)sh_video->fps==1000 || (int)sh_video->fps<=1){ | |
| 487 float next_pts = ds_get_next_pts(d_video); | |
| 488 float d= next_pts > 0 ? next_pts - d_video->pts : d_video->pts-pts1; | |
| 489 if(d>=0){ | |
| 490 frame_time = d; | |
| 491 } | |
| 492 } | |
| 493 break; | |
| 485 } | 494 } |
| 486 | 495 |
| 487 if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS || | 496 if(demuxer->file_format==DEMUXER_TYPE_MPEG_PS || |
| 488 demuxer->file_format==DEMUXER_TYPE_MPEG_TS || | 497 demuxer->file_format==DEMUXER_TYPE_MPEG_TS || |
| 489 demuxer->file_format==DEMUXER_TYPE_MPEG_ES || | 498 demuxer->file_format==DEMUXER_TYPE_MPEG_ES || |