[Mplayer-cvslog] CVS: main/libmpdemux demux_viv.c,1.11,1.12

[Alex Beregszaszi]

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

Modified Files:
	demux_viv.c 
Log Message:
changed to generate fourcc's like: viv<version> -> viv1,viv2

Index: demux_viv.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_viv.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- demux_viv.c	22 Nov 2001 15:10:38 -0000	1.11
+++ demux_viv.c	25 Nov 2001 16:33:39 -0000	1.12
@@ -18,6 +18,7 @@
 
 typedef struct {
     /* generic */
+    char	version;
     int		supported;
     /* info */
     char	*title;
@@ -82,8 +83,12 @@
 	{
 	    mp_msg(MSGT_DEMUX, MSGL_DBG2, "Version: %s\n", param);
 	    if (!strncmp(param, "Vivo/1", 6) || !strncmp(param, "Vivo/2", 6))
+	    {
 //	    if (atoi(param) == 1 || atoi(param) == 2)
 		priv->supported = 1;
+		/* safe version for fourcc */
+		priv->version = param[5];
+	    }
 	}
 
 	/* video specific */	
@@ -469,8 +474,10 @@
   
 
 {		sh_video_t* sh=new_sh_video(demuxer,0);
-    
-		sh->format=0x6f766976; // "vivo"
+
+		/* viv1, viv2 (for better codecs.conf) */    
+		sh->format = mmioFOURCC('v', 'i', 'v', priv->version);
+//		sh->format=0x6f766976; // "vivo"
 		if(!sh->fps)
 		{
 		    if (priv->fps)