[Mplayer-cvslog] CVS: main codec-cfg.c,1.2,1.3 codec-cfg.h,1.1,1.2

[GEREOFFY]

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

Modified Files:
	codec-cfg.c codec-cfg.h 
Log Message:
outflags[] reading fixed

Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** codec-cfg.c	2001/04/06 23:28:18	1.2
--- codec-cfg.c	2001/04/06 23:56:42	1.3
***************
*** 139,148 ****
--- 139,160 ----
  }
  
+ /*
  short get_flags(char *s)
  {
+ 	static char *flagstr[] = {
+ 		"flip",
+ 		"noflip",
+ 		"yuvhack",
+ 		NULL
+ 	};
+         int j;
+ 
+         printf("flags='%s'\n",s);
+ 
  	if (!s)
  		return 0;
  	return 1;
  }
+ */
  
  int add_to_out(char *sfmt, char *sflags, unsigned int *outfmt,
***************
*** 178,181 ****
--- 190,200 ----
  		IMGFMT_BGR|32
  	};
+ 	static char *flagstr[] = {
+ 		"flip",
+ 		"noflip",
+ 		"yuvhack",
+ 		NULL
+ 	};
+ 
  	int i, j;
  	unsigned char flags;
***************
*** 188,195 ****
  	}
  
! 	flags = get_flags(sflags);
  
  	do {
! 		for (j = 0; fmtstr[i] != NULL; j++)
  			if (!strncmp(sfmt, fmtstr[j], strlen(fmtstr[j])))
  				break;
--- 207,223 ----
  	}
  
! 	flags = 0; //get_flags(sflags);
! 	if(sflags) do {
! 		for (j = 0; flagstr[j] != NULL; j++)
! 			if (!strncmp(sflags, flagstr[j], strlen(flagstr[j])))
! 				break;
! 		if (flagstr[j] == NULL) return 0; // error!
! 		flags|=(1<<j);
! 		sflags+=strlen(flagstr[j]);
! 	} while (*(sflags++) == ',');
!         
  
  	do {
! 		for (j = 0; fmtstr[j] != NULL; j++)
  			if (!strncmp(sfmt, fmtstr[j], strlen(fmtstr[j])))
  				break;
***************
*** 198,205 ****
  		outfmt[i] = fmtnum[j];
  		outflags[i] = flags;
  		sfmt+=strlen(fmtstr[j]);
  	} while (*(sfmt++) == ',');
! 	if (*(--sfmt) != '\0')
! 		return 0;
  	return 1;
  }
--- 226,234 ----
  		outfmt[i] = fmtnum[j];
  		outflags[i] = flags;
+                 ++i;
  		sfmt+=strlen(fmtstr[j]);
  	} while (*(sfmt++) == ',');
! 	if (*(--sfmt) != '\0') return 0;
!         
  	return 1;
  }
***************
*** 459,462 ****
--- 488,496 ----
                if(c->fourcc[j]!=0xFFFFFFFF){
                    printf("fourcc %02d:  %08X (%.4s) ===> %08X (%.4s)\n",j,c->fourcc[j],&c->fourcc[j],c->fourccmap[j],&c->fourccmap[j]);
+               }
+             }
+             for(j=0;j<CODECS_MAX_OUTFMT;j++){
+               if(c->outfmt[j]!=0xFFFFFFFF){
+                   printf("outfmt %02d:  %08X (%.4s)  flags: %d\n",j,c->outfmt[j],&c->outfmt[j],c->outflags[j]);
                }
              }

Index: codec-cfg.h
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** codec-cfg.h	2001/04/06 23:20:46	1.1
--- codec-cfg.h	2001/04/06 23:56:42	1.2
***************
*** 18,21 ****
--- 18,26 ----
  #define CODECS_FLAG_AUDIO	(1<<0)
  
+ #define CODECS_FLAG_FLIP	(1<<0)
+ #define CODECS_FLAG_NOFLIP	(1<<1)
+ #define CODECS_FLAG_YUVHACK	(1<<2)
+ 
+ 
  #warning nem kellene ket typedef GUID-nak...
  typedef struct {


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