[MPlayer-cvslog] CVS: main codec-cfg.c,1.112,1.113

[Reimar Döffinger CVS]

CVS change done by Reimar Döffinger CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv15363

Modified Files:
	codec-cfg.c 
Log Message:
fix crash when a "driver" line is missing in codecs.conf.


Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- codec-cfg.c	30 Oct 2004 10:09:52 -0000	1.112
+++ codec-cfg.c	14 Nov 2004 11:39:23 -0000	1.113
@@ -332,13 +332,12 @@
 		mp_msg(MSGT_CODECCFG,MSGL_ERR,MSGTR_CodecLacksFourcc, c->name);
 		return 0;
 	}
+#endif
 
-	/* XXX fix this: shitty with 'null' codec */
-	if (!c->driver) {
+	if (!c->drv) {
 		mp_msg(MSGT_CODECCFG,MSGL_ERR,MSGTR_CodecLacksDriver, c->name);
 		return 0;
 	}
-#endif
 
 #if 0
 #warning codec->driver == 4;... <- ezt nem kellene belehegeszteni...
@@ -746,8 +745,10 @@
 }
 
 void codecs_uninit_free() {
+	if (video_codecs)
 	codecs_free(video_codecs,nr_vcodecs);
 	video_codecs=NULL;
+	if (audio_codecs)
 	codecs_free(audio_codecs,nr_acodecs);
 	audio_codecs=NULL;
 }