multiplexer/descref.c - diff

Return to descref.c CVS log

Up to [DVB] / multiplexer

Diff for /multiplexer/descref.c between versions 1.5 and 1.6

version 1.5, 2001/08/01 08:23:18	version 1.6, 2001/08/01 10:27:41
Line 58 int put_descriptor (file_descr *f,	Line 58 int put_descriptor (file_descr *f,
int *infolen)	int *infolen)
{	{
byte t, l;	byte t, l;
if ((t = f->data.ptr[index]) >= NUMBER_ELEMD) {	t = f->data.ptr[index];
	#if (NUMBER_DESCR < 0x100)
	if (t >= NUMBER_DESCR) {
warn (LWAR,"Bad Descriptor Tag",EDES,2,1,t);	warn (LWAR,"Bad Descriptor Tag",EDES,2,1,t);
*infolen = -1;	*infolen = -1;
return (index);	return (index);
}	}
	#endif
warn (LINF,"Put Descriptor",EDES,2,0,t);	warn (LINF,"Put Descriptor",EDES,2,0,t);
list_incr (index,f->data,1);	list_incr (index,f->data,1);
l = f->data.ptr[index];	l = f->data.ptr[index];
Line 96 byte put_descriptor_s (byte d,	Line 99 byte put_descriptor_s (byte d,
int *infolen)	int *infolen)
{	{
byte t, l;	byte t, l;
if ((t = *d++) >= NUMBER_ELEMD) {	t = *d++;
	#if (NUMBER_DESCR < 0x100)
	if (t >= NUMBER_DESCR) {
warn (LWAR,"Bad Descriptor Tag",EDES,3,1,t);	warn (LWAR,"Bad Descriptor Tag",EDES,3,1,t);
*infolen = -1;	*infolen = -1;
return (d);	return (d);
}	}
	#endif
warn (LINF,"Put Descriptor",EDES,3,0,t);	warn (LINF,"Put Descriptor",EDES,3,0,t);
l = *d++;	l = *d++;
if ((*infolen -= (l + 2)) >= 0) {	if ((*infolen -= (l + 2)) >= 0) {
Line 152 static void save_mapreference (maprefere	Line 158 static void save_mapreference (maprefere
s->version = map->version;	s->version = map->version;
/* ... = map->programnumber */	/* ... = map->programnumber */
memcpy (&s->autodescr->data[0],dscr,size);	memcpy (&s->autodescr->data[0],dscr,size);
i = NUMBER_ELEMD;	i = NUMBER_DESCR;
while (--i >= 0) {	while (--i >= 0) {
if (map->elemdnew[i] == NULL) {	if (map->elemdnew[i] == NULL) {
s->autodescr->refx[i] = NULL;	s->autodescr->refx[i] = NULL;

LinuxTV legacy CVS <linuxtv.org/cvs>

Removed from v.1.5
changed lines
	Added in v.1.6