[MPlayer-cvslog] r19087 - in trunk: ChangeLog DOCS/man/en/mplayer.1 DOCS/xml/en/codecs.xml DOCS/xml/en/install.xml cfg-common.h cfg-mencoder.h cfg-mplayer.h codec-cfg.c configure divx4_vbr.c divx4_vbr.h etc/codecs.conf help/help_mp-en.h libmpcodecs/Makefile libmpcodecs/vd.c libmpcodecs/vd_divx4.c libmpcodecs/vd_odivx.c libmpcodecs/ve.c libmpcodecs/ve_divx4.c libmpdemux/video.c libvo/video_out.c mencoder.c

[Diego Biurrun]

On Fri, Jul 14, 2006 at 07:14:17PM +0200, diego wrote:
> 
> Modified:
>    trunk/libmpdemux/video.c
> 
> Log:
> Remove support for obsolete and non-free divx4/odivx libraries.
> 
> --- trunk/libmpdemux/video.c	(original)
> +++ trunk/libmpdemux/video.c	Fri Jul 14 19:14:16 2006
> @@ -579,14 +579,12 @@
>        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;

Thankfully nobody noticed this one, else he would have made me drink
insane amounts of a certain softdrink ;-)

In any case the Elphel guys sent in a patch for this issue that should
work better than this one.  I'll get to it in a moment.

Diego