diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-16 03:09:50 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-16 03:09:50 +0000 |
| commit | d8b9a179e89f95eef1878ae824a9043c4acd93f7 (patch) | |
| tree | ad4228fb864dc3dbb1fa3b32f768753393807031 /codec-cfg.c | |
| parent | b7ad040a863f0466fbf4b7690a247fd483f82b4f (diff) | |
| download | mpv-d8b9a179e89f95eef1878ae824a9043c4acd93f7.tar.bz2 mpv-d8b9a179e89f95eef1878ae824a9043c4acd93f7.tar.xz | |
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@cfht.hawaii.edu>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8206 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'codec-cfg.c')
| -rw-r--r-- | codec-cfg.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/codec-cfg.c b/codec-cfg.c index 9351dd4644..651f107c7b 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -470,12 +470,12 @@ int parse_codec_cfg(char *cfgfile) 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 @@ void list_codecs(int audioflag){ #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 @@ void parsehtml(FILE *f1,FILE *f2,codecs_t *codec,int section,int dshow){ 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 @@ int main(void) 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: |