Mercurial > mplayer.hg

changeset 3113:c0e6a39d2ab7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed to generate fourcc's like: viv<version> -> viv1,viv2
author alex
date Sun, 25 Nov 2001 16:33:39 +0000
parents 30cc1717dca6
children 6aa09e66c687
files libmpdemux/demux_viv.c
diffstat 1 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_viv.c	Sun Nov 25 16:27:13 2001 +0000
+++ b/libmpdemux/demux_viv.c	Sun Nov 25 16:33:39 2001 +0000
@@ -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)