[Mplayer-cvslog] CVS: main codec-cfg.c,1.96,1.97

[Arpi of Ize]

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

Modified Files:
	codec-cfg.c 
Log Message:
This patch goes into the #ifdef CODECS2HTML section of
codec-cfg.c and makes it possible to build that utility
again.  It also fixes two cases where *_codecs was set
to NULL if it was NULL ;-)
Sidik Isani <lksi at cfht.hawaii.edu>


Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- codec-cfg.c	17 Oct 2002 00:20:44 -0000	1.96
+++ codec-cfg.c	16 Nov 2002 03:09:50 -0000	1.97
@@ -470,12 +470,12 @@
 	int codec_type;		/* TYPE_VIDEO/TYPE_AUDIO */
 	int tmp, i;
 	
-	// in case we call it secont time
+	// in case we call it a second time
 	if(video_codecs!=NULL)free(video_codecs);
-	else video_codecs=NULL;
+	video_codecs=NULL;
  
  	if(audio_codecs!=NULL)free(audio_codecs);
-	else audio_codecs=NULL;
+	audio_codecs=NULL;
 	
 	nr_vcodecs = 0;
 	nr_acodecs = 0;
@@ -830,6 +830,13 @@
 
 
 #ifdef CODECS2HTML
+/*
+ * Fake out GUI references when building the codecs2html utility.
+ */
+#ifdef HAVE_NEW_GUI
+void gtkMessageBox( int type,char * str ) { return; }
+int use_gui = 0;
+#endif
 
 void wrapline(FILE *f2,char *s){
     int c;
@@ -863,7 +870,7 @@
             case 'd':
                 wrapline(f2,codec->dll); break;
             case 'D':
-                fprintf(f2,"%c",codec->driver==dshow?'+':'-'); break;
+                fprintf(f2,"%c",!strcmp(codec->drv,"dshow")?'+':'-'); break;
             case 'F':
                 for(d=0;d<CODECS_MAX_FOURCC;d++)
                     if(!d || codec->fourcc[d]!=0xFFFFFFFF)
@@ -949,13 +956,13 @@
                     case 0:
                     case 5:
                         if(cl[i].status==CODECS_STATUS_WORKING)
-                            if(!(cl[i].driver==win32 || cl[i].driver==dshow || cl[i].driver==win32ex))
+                            if(!(!strcmp(cl[i].drv,"win32") || !strcmp(cl[i].drv,"dshow") || !strcmp(cl[i].drv,"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 || cl[i].driver==win32ex)
+                            if((!strcmp(cl[i].drv,"win32") || !strcmp(cl[i].drv,"dshow") || !strcmp(cl[i].drv,"win32ex")))
                                 parsehtml(f1,f2,&cl[i],section,dshow);
                         break;
                     case 2: