RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Use FOURCC macro to encode fcc values. Avoids accessing 32-bit data from 

unaligned memory locations and improves portability


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1306 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
jkeil 2001-07-12 15:10:06 +00:00
parent 796cc66970
commit 88b34d0d11
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
codec-cfg.c
View File

@ -15,6 +15,9 @@
#include <assert.h>
#include <string.h>
#include "loader.h" // loader+avifmt for mmioFOURCC
#include "wine/avifmt.h"
#include "libvo/img_format.h"
#include "codec-cfg.h"
@ -34,7 +37,7 @@ static int add_to_fourcc(char *s, char *alias, unsigned int *fourcc,
unsigned int *map)
{
int i, j, freeslots;
char **aliasp;
char *aliasp;
unsigned int tmp;
/* find first unused slot */
@ -44,14 +47,14 @@ static int add_to_fourcc(char *s, char *alias, unsigned int *fourcc,
if (!freeslots)
goto err_out_too_many;
aliasp = (alias) ? &alias : &s;
aliasp = (alias) ? alias : s;
do {
tmp = *((unsigned int *) s);
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] = *((unsigned int *) (*aliasp));
map[i] = mmioFOURCC(aliasp[0], aliasp[1], aliasp[2], aliasp[3]);
s += 4;
i++;
} while ((*(s++) == ',') && --freeslots);