Mercurial > mplayer.hg

diff codec-cfg.c @ 2681:7f0862258f4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fourcc mapping fixed - 10l to someone
author arpi
date Sun, 04 Nov 2001 14:00:53 +0000
parents a06f9c1df28e
children b4d46817f050
line wrap: on
line diff
--- a/codec-cfg.c	Sun Nov 04 13:50:20 2001 +0000
+++ b/codec-cfg.c	Sun Nov 04 14:00:53 2001 +0000
@@ -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);