[Mplayer-cvslog] CVS: main codec-cfg.c,1.35,1.36

[Atmosfear]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv25661

Modified Files:
	codec-cfg.c 
Log Message:
Fixed vfwex section, null codec and other fourcc issues and improved codecs-in.html usability.


Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- codec-cfg.c	21 Sep 2001 21:40:16 -0000	1.35
+++ codec-cfg.c	23 Sep 2001 20:40:04 -0000	1.36
@@ -680,8 +680,8 @@
                 fprintf(f2,"%c",codec->driver==dshow?'+':'-'); break;
             case 'F':
                 for(d=0;d<CODECS_MAX_FOURCC;d++)
-                    if(codec->fourcc[d]!=0xFFFFFFFF)
-                        fprintf(f2,"%s%.4s",d?"<br>":"",codec->fourcc[d]<0x20202020?"-":(char*) &codec->fourcc[d]);
+                    if(!d || codec->fourcc[d]!=0xFFFFFFFF)
+                        fprintf(f2,"%s%.4s",d?"<br>":"",(codec->fourcc[d]==0xFFFFFFFF || codec->fourcc[d]<0x20202020)?!d?"-":"":(char*) &codec->fourcc[d]);
                 break;
             case 'f':
                 for(d=0;d<CODECS_MAX_FOURCC;d++)
@@ -727,6 +727,7 @@
         int nr_codecs;
         int win32=-1;
         int dshow=-1;
+        int win32ex=-1;
 
 	if (!(codecs = parse_codec_cfg("etc/codecs.conf")))
 		return 0;
@@ -757,7 +758,7 @@
                     // video
 		    cl = codecs[0];
 		    nr_codecs = nr_vcodecs;
-                    dshow=4;win32=2;
+                    dshow=4;win32=2;win32ex=6;
                 }
                 pos=ftell(f1);
                 for(i=0;i<nr_codecs;i++){
@@ -766,13 +767,13 @@
                     case 0:
                     case 5:
                         if(cl[i].status==CODECS_STATUS_WORKING)
-                            if(!(cl[i].driver==win32 || cl[i].driver==dshow))
+                            if(!(cl[i].driver==win32 || cl[i].driver==dshow || cl[i].driver==win32ex))
                                 parsehtml(f1,f2,&cl[i],section,dshow);
                         break;
                     case 1:
                     case 6:
                         if(cl[i].status==CODECS_STATUS_WORKING)
-                            if(cl[i].driver==win32 || cl[i].driver==dshow)
+                            if(cl[i].driver==win32 || cl[i].driver==dshow || cl[i].driver==win32ex)
                                 parsehtml(f1,f2,&cl[i],section,dshow);
                         break;
                     case 2: