comparison codec-cfg.c @ 1305:0a8237e28ce0

Use FOURCC macro to encode fcc values. Avoids accessing 32-bit data from unaligned memory locations and improves portability

1304:ecb834719dc9

#include <errno.h>
#include <ctype.h>
#include <assert.h>
#include <string.h>

#include "libvo/img_format.h"
#include "codec-cfg.h"

#define PRINT_LINENUM printf(" at line %d\n", line_num)

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 */
	for (i = 0; i < CODECS_MAX_FOURCC && fourcc[i] != 0xffffffff; i++)
		/* NOTHING */;
	freeslots = CODECS_MAX_FOURCC - i;
	if (!freeslots)
		goto err_out_too_many;

	aliasp = (alias) ? &alias : &s;
	do {
		tmp = *((unsigned int *) s);
		for (j = 0; j < i; j++)
			if (tmp == fourcc[j])
				goto err_out_duplicated;
		fourcc[i] = tmp;
		map[i] = *((unsigned int *) (*aliasp));
		s += 4;
		i++;
	} while ((*(s++) == ',') && --freeslots);

	if (!freeslots)

1305:0a8237e28ce0

#include <errno.h>
#include <ctype.h>
#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"

#define PRINT_LINENUM printf(" at line %d\n", line_num)

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 */
	for (i = 0; i < CODECS_MAX_FOURCC && fourcc[i] != 0xffffffff; i++)
		/* NOTHING */;
	freeslots = CODECS_MAX_FOURCC - i;
	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]);
		s += 4;
		i++;
	} while ((*(s++) == ',') && --freeslots);

	if (!freeslots)