mirror of https://github.com/mpv-player/mpv
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:
parent
796cc66970
commit
88b34d0d11
11
codec-cfg.c
11
codec-cfg.c
|
@ -15,6 +15,9 @@
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
|
#include "loader.h" // loader+avifmt for mmioFOURCC
|
||||||
|
#include "wine/avifmt.h"
|
||||||
|
|
||||||
#include "libvo/img_format.h"
|
#include "libvo/img_format.h"
|
||||||
#include "codec-cfg.h"
|
#include "codec-cfg.h"
|
||||||
|
|
||||||
|
@ -34,7 +37,7 @@ static int add_to_fourcc(char *s, char *alias, unsigned int *fourcc,
|
||||||
unsigned int *map)
|
unsigned int *map)
|
||||||
{
|
{
|
||||||
int i, j, freeslots;
|
int i, j, freeslots;
|
||||||
char **aliasp;
|
char *aliasp;
|
||||||
unsigned int tmp;
|
unsigned int tmp;
|
||||||
|
|
||||||
/* find first unused slot */
|
/* find first unused slot */
|
||||||
|
@ -44,14 +47,14 @@ static int add_to_fourcc(char *s, char *alias, unsigned int *fourcc,
|
||||||
if (!freeslots)
|
if (!freeslots)
|
||||||
goto err_out_too_many;
|
goto err_out_too_many;
|
||||||
|
|
||||||
aliasp = (alias) ? &alias : &s;
|
aliasp = (alias) ? alias : s;
|
||||||
do {
|
do {
|
||||||
tmp = *((unsigned int *) s);
|
tmp = mmioFOURCC(s[0], s[1], s[2], s[3]);
|
||||||
for (j = 0; j < i; j++)
|
for (j = 0; j < i; j++)
|
||||||
if (tmp == fourcc[j])
|
if (tmp == fourcc[j])
|
||||||
goto err_out_duplicated;
|
goto err_out_duplicated;
|
||||||
fourcc[i] = tmp;
|
fourcc[i] = tmp;
|
||||||
map[i] = *((unsigned int *) (*aliasp));
|
map[i] = mmioFOURCC(aliasp[0], aliasp[1], aliasp[2], aliasp[3]);
|
||||||
s += 4;
|
s += 4;
|
||||||
i++;
|
i++;
|
||||||
} while ((*(s++) == ',') && --freeslots);
|
} while ((*(s++) == ',') && --freeslots);
|
||||||
|
|
Loading…
Reference in New Issue