diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-04 14:00:53 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-04 14:00:53 +0000 |
commit | d79da48df50b8a061b163fdaede79727cef9cb73 (patch) | |
tree | c1e7f816ef42da5c9915170ec7ddd4653ae72448 /codec-cfg.c | |
parent | a28c29e8f347330fa1a4f5a1e1f197aadf44a8c3 (diff) | |
download | mpv-d79da48df50b8a061b163fdaede79727cef9cb73.tar.bz2 mpv-d79da48df50b8a061b163fdaede79727cef9cb73.tar.xz |
fourcc mapping fixed - 10l to someone
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2682 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'codec-cfg.c')
-rw-r--r-- | codec-cfg.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/codec-cfg.c b/codec-cfg.c index fcce9a2481..32195306f5 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -37,7 +37,6 @@ static int add_to_fourcc(char *s, char *alias, unsigned int *fourcc, unsigned int *map) { int i, j, freeslots; - char *aliasp; unsigned int tmp; /* find first unused slot */ @@ -47,14 +46,13 @@ static int add_to_fourcc(char *s, char *alias, unsigned int *fourcc, 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); |