[MPlayer-dev-eng] [BUG] sig11 if codecs.conf driver line is missing.

[Reimar Döffinger]

Hi,
> another bug? fool on me for not editing the codecs.conf properly!
> 
> [22:32] <igla> #0  0x0806e6f0 in find_codec (fourcc=268435458, fourccmap=0x0,
> [22:32] <igla>     start=0x84aa730, audioflag=0) at codec-cfg.c:799
> [22:32] <igla> #1  0x080a09f8 in init_video (sh_video=0x8465500, codecname=0x0, vfm=0x0,
> [22:32] <igla>     status=2) at dec_video.c:172
> [22:32] <igla> #2  0x080a0d6c in init_best_video_codec (sh_video=0x8465500,
> [22:32] <igla>     video_codec_list=0xbfbfd584, video_fm_list=0x0) at dec_video.c:283
> [22:33] <igla> #3  0x08067d11 in main (argc=2, argv=0xbfbfe8ec) at mplayer.c:1970

attached patch should fix. The comment about problems with null codec
does not seem to be correct anymore!?
Great implementation of codecs_uninit_free btw, what sense does setting
to NULL make when it's nowhere checked for NULL? That really deserves a
cola-truck!

Greetings,
Reimar Döffinger
-------------- next part --------------
Index: codec-cfg.c
===================================================================
RCS file: /cvsroot/mplayer/main/codec-cfg.c,v
retrieving revision 1.112
diff -u -r1.112 codec-cfg.c
--- codec-cfg.c	30 Oct 2004 10:09:52 -0000	1.112
+++ codec-cfg.c	13 Nov 2004 11:18:13 -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;
 }