[Mplayer-cvslog] CVS: main codec-cfg.c,1.13,1.14

[Szabolcs Berecz]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv28470

Modified Files:
	codec-cfg.c 
Log Message:
guid

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** codec-cfg.c	2001/04/10 23:18:01	1.13
--- codec-cfg.c	2001/04/10 23:56:38	1.14
***************
*** 339,342 ****
--- 339,343 ----
  	codecs_t **codecsp = NULL;// points to audio_codecs or to video_codecs
  	static codecs_t *ret_codecs[2] = {NULL,NULL};
+ 	char *endptr;	// strtoul()...
  	int *nr_codecsp;
  	int codec_type;		/* TYPE_VIDEO/TYPE_AUDIO */
***************
*** 455,467 ****
  			if (get_token(11, 11) < 0)
  				goto err_out_parse_error;
! #warning GUID-nak szammal kell kezdodni!!!!!!!! ez igy ok?
! 			for (i = 0; i < 11; i++)
! 				if (!isdigit(*token[i]))
! 					goto err_out_parse_error;
!                         codec->guid.f1=strtoul(token[0],NULL,0);
!                         codec->guid.f2=strtoul(token[1],NULL,0);
!                         codec->guid.f3=strtoul(token[2],NULL,0);
  			for (i = 0; i < 8; i++) {
!                             codec->guid.f4[i]=strtoul(token[i + 3],NULL,0);
  			}
  		} else if (!strcmp(token[0], "out")) {
--- 456,472 ----
  			if (get_token(11, 11) < 0)
  				goto err_out_parse_error;
!                         codec->guid.f1=strtoul(token[0],&endptr,0);
! 			if (*endptr != '\0' && *endptr != ',')
! 				goto err_out_parse_error;
!                         codec->guid.f2=strtoul(token[1],&endptr,0);
! 			if (*endptr != '\0' && *endptr != ',')
! 				goto err_out_parse_error;
!                         codec->guid.f3=strtoul(token[2],&endptr,0);
! 			if (*endptr != '\0' && *endptr != ',')
! 				goto err_out_parse_error;
  			for (i = 0; i < 8; i++) {
!                             codec->guid.f4[i]=strtoul(token[i + 3],&endptr,0);
! 				if (*endptr != '\0' && *endptr != ',')
! 					goto err_out_parse_error;
  			}
  		} else if (!strcmp(token[0], "out")) {


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog