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

[Nico Sabbi CVS]

CVS change done by Nico Sabbi CVS

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

Modified Files:
	muxer_lavf.c 
Log Message:
in fix_parameters() move assignment of audio bitrate to the proper block (the bitrate for video is actually hardcoded to 800000)

Index: muxer_lavf.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_lavf.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- muxer_lavf.c	12 Mar 2006 18:58:08 -0000	1.26
+++ muxer_lavf.c	12 Mar 2006 19:05:57 -0000	1.27
@@ -183,9 +183,6 @@
 #else
 	ctx = &(spriv->avstream->codec);
 #endif
-	
-        if(stream->wf && stream->wf->nAvgBytesPerSec)
-            ctx->bit_rate = stream->wf->nAvgBytesPerSec * 8;
         ctx->rc_buffer_size= stream->vbv_size;
         ctx->rc_max_rate= stream->max_rate;
 
@@ -198,6 +195,8 @@
 		ctx->codec_tag = codec_get_wav_tag(ctx->codec_id);
 #endif
 		mp_msg(MSGT_MUXER, MSGL_INFO, "AUDIO CODEC ID: %x, TAG: %x\n", ctx->codec_id, (uint32_t) ctx->codec_tag);
+		if(stream->wf->nAvgBytesPerSec)
+			ctx->bit_rate = stream->wf->nAvgBytesPerSec * 8;
 		ctx->sample_rate = stream->wf->nSamplesPerSec;
 //                mp_msg(MSGT_MUXER, MSGL_INFO, "stream->h.dwSampleSize: %d\n", stream->h.dwSampleSize);
 		ctx->channels = stream->wf->nChannels;