[Mplayer-cvslog] CVS: main/libmpdemux demux_viv.c,1.6,1.7

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv21667

Modified Files:
	demux_viv.c 
Log Message:
disabled vivo2 scaling (decodes some vivo2 files)

Index: demux_viv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_viv.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- demux_viv.c	10 Nov 2001 12:36:03 -0000	1.6
+++ demux_viv.c	11 Nov 2001 00:31:34 -0000	1.7
@@ -187,7 +187,7 @@
     buf[len]=0;
 //    printf("VIVO header: '%s'\n",buf);
 
-#if 1
+#if 0
     vivo_parse_text_header(demuxer, len);
     if (priv->supported == 0)
 	return 0;
@@ -472,6 +472,11 @@
 		    else
 			sh->fps=15.0f;
 		sh->frametime=1.0f/sh->fps;
+
+#warning "FIXME! we can't scale"
+		priv->disp_width = priv->width;
+		priv->disp_height = priv->height;
+
 		if (priv->disp_width)
 		    sh->disp_w = priv->disp_width;
 		else