[MPlayer-cvslog] CVS: main/libmpdemux muxer_lavf.c,1.23,1.24

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

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

Modified Files:
	muxer_lavf.c 
Log Message:
fixed C99-ism introduced with previous commit

Index: muxer_lavf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_lavf.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- muxer_lavf.c	12 Mar 2006 17:46:51 -0000	1.23
+++ muxer_lavf.c	12 Mar 2006 18:06:46 -0000	1.24
@@ -103,17 +103,17 @@
 
 static muxer_stream_t* lavf_new_stream(muxer_t *muxer, int type)
 {
-	if(!muxer) return NULL;
-	muxer_priv_t *priv = (muxer_priv_t*) muxer->priv;
+	muxer_priv_t *priv;
 	muxer_stream_t *stream;
 	muxer_stream_priv_t *spriv;
 	AVCodecContext *ctx;
 
-	if(type != MUXER_TYPE_VIDEO && type != MUXER_TYPE_AUDIO) 
+	if(!muxer || (type != MUXER_TYPE_VIDEO && type != MUXER_TYPE_AUDIO))
 	{
-		mp_msg(MSGT_MUXER, MSGL_ERR, "UNKNOW TYPE %d\n", type);
+		mp_msg(MSGT_MUXER, MSGL_ERR, "NULL MUXER PASSED OR UNKNOW TYPE %d\n", type);
 		return NULL;
 	}
+	priv = (muxer_priv_t*) muxer->priv;
 	
 	stream = (muxer_stream_t*) calloc(1, sizeof(muxer_stream_t));
 	if(!stream)