[MPlayer-cvslog] CVS: main/libmpdemux muxer_lavf.c,1.25,1.26

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

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

Modified Files:
	muxer_lavf.c 
Log Message:
check stream->wf and stream->bih before using them in fix_parameters(). Fixes cid 43

Index: muxer_lavf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_lavf.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- muxer_lavf.c	12 Mar 2006 18:11:32 -0000	1.25
+++ muxer_lavf.c	12 Mar 2006 18:58:08 -0000	1.26
@@ -191,6 +191,8 @@
 
 	if(stream->type == MUXER_TYPE_AUDIO)
 	{
+		if(!stream->wf)
+			return;
 		ctx->codec_id = codec_get_wav_id(stream->wf->wFormatTag); 
 #if 0 //breaks aac in mov at least
 		ctx->codec_tag = codec_get_wav_tag(ctx->codec_id);
@@ -220,6 +222,8 @@
 	}
 	else if(stream->type == MUXER_TYPE_VIDEO)
 	{
+		if(!stream->bih)
+			return;
 		ctx->codec_id = codec_get_bmp_id(stream->bih->biCompression);
                 if(ctx->codec_id <= 0)
                     ctx->codec_tag= stream->bih->biCompression;