diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-05-06 07:31:49 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-05-06 07:31:49 +0000 |
| commit | c3ec96fb711b667dba13f9cdfa092d360270ab16 (patch) | |
| tree | 35ad0886eff82e8b5ee485b83509d1dd735c7a47 /libmpdemux | |
| parent | a2783c69ba77e1e6bf90675cf73c44b66a821178 (diff) | |
| download | mpv-c3ec96fb711b667dba13f9cdfa092d360270ab16.tar.bz2 mpv-c3ec96fb711b667dba13f9cdfa092d360270ab16.tar.xz | |
support for vfps OGM files
patch by Elphel Inc. (blessed by Roberto)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18395 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/video.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index d5092f7f75..896004921b 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -607,13 +607,15 @@ int video_read_frame(sh_video_t* sh_video,float* frame_time_ptr,unsigned char** case DEMUXER_TYPE_MOV: case DEMUXER_TYPE_FILM: case DEMUXER_TYPE_VIVO: + case DEMUXER_TYPE_OGG: case DEMUXER_TYPE_REAL: case DEMUXER_TYPE_ASF: { float next_pts = ds_get_next_pts(d_video); float d= next_pts > 0 ? next_pts - d_video->pts : d_video->pts-pts1; if(d>=0){ if(d>0){ - if((int)sh_video->fps==1000) + /* 10000 is used for OGM only */ + if((int)sh_video->fps==1000||(int)sh_video->fps==10000) mp_msg(MSGT_CPLAYER,MSGL_V,"\navg. framerate: %d fps \n",(int)(1.0f/d)); sh_video->frametime=d; // 1ms sh_video->fps=1.0f/d; |