Mercurial > mplayer.hg

changeset 13936:589b227e3367

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix crash when a "driver" line is missing in codecs.conf.
author reimar
date Sun, 14 Nov 2004 11:39:23 +0000
parents 20d243a3c398
children 63ac1fbef23d
files codec-cfg.c
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/codec-cfg.c	Sun Nov 14 11:36:40 2004 +0000
+++ b/codec-cfg.c	Sun Nov 14 11:39:23 2004 +0000
@@ -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;
 }