[Mplayer-cvslog] CVS: main codec-cfg.c,1.44,1.45

Arpi of Ize arpi at mplayer.dev.hu
Sun Nov 4 15:00:56 CET 2001


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

Modified Files:
	codec-cfg.c 
Log Message:
fourcc mapping fixed - 10l to someone

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- codec-cfg.c	23 Oct 2001 14:01:13 -0000	1.44
+++ codec-cfg.c	4 Nov 2001 14:00:53 -0000	1.45
@@ -37,7 +37,6 @@
 		unsigned int *map)
 {
 	int i, j, freeslots;
-	char *aliasp;
 	unsigned int tmp;
 
 	/* find first unused slot */
@@ -47,14 +46,13 @@
 	if (!freeslots)
 		goto err_out_too_many;
 
-	aliasp = (alias) ? alias : s;
 	do {
 		tmp = mmioFOURCC(s[0], s[1], s[2], s[3]);
 		for (j = 0; j < i; j++)
 			if (tmp == fourcc[j])
 				goto err_out_duplicated;
 		fourcc[i] = tmp;
-		map[i] = mmioFOURCC(aliasp[0], aliasp[1], aliasp[2], aliasp[3]);
+		map[i] = alias ? mmioFOURCC(alias[0], alias[1], alias[2], alias[3]) : tmp;
 		s += 4;
 		i++;
 	} while ((*(s++) == ',') && --freeslots);




More information about the MPlayer-cvslog mailing list