diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-14 17:14:16 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-14 17:14:16 +0000 |
| commit | f89a7da6043d51f97e8c8c9d7cae64d205b21866 (patch) | |
| tree | dfb2920478c3c297ee68a0a5aaed33c9d3072fd9 /libmpdemux | |
| parent | cb2e693d2246c450842810b1e49452a49489938a (diff) | |
| download | mpv-f89a7da6043d51f97e8c8c9d7cae64d205b21866.tar.bz2 mpv-f89a7da6043d51f97e8c8c9d7cae64d205b21866.tar.xz | |
Remove support for obsolete and non-free divx4/odivx libraries.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19087 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/video.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libmpdemux/video.c b/libmpdemux/video.c index 40e7689e6d..2bff7fa75c 100644 --- a/libmpdemux/video.c +++ b/libmpdemux/video.c @@ -579,14 +579,12 @@ 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_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){ - /* 10000 is used for OGM only */ - if((int)sh_video->fps==1000||(int)sh_video->fps==10000) + if((int)sh_video->fps==1000) 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; |