[MPlayer-cvslog] CVS: main mencoder.c,1.268,1.269

[Jindrich Makovicka CVS]

CVS change done by Jindrich Makovicka CVS

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

Modified Files:
	mencoder.c 
Log Message:
cleanups of the Multiple files patch
by Oded Shimon <ods15 at ods15.dyndns.org>



Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.268
retrieving revision 1.269
diff -u -r1.268 -r1.269
--- mencoder.c	25 Feb 2005 12:59:59 -0000	1.268
+++ mencoder.c	25 Feb 2005 22:49:36 -0000	1.269
@@ -1172,7 +1172,7 @@
 timer_start=GetTimerMS();
 } // if (!curfile) // if this was the first file.
 else if (sh_audio) {
-	int out_format, out_bps, out_minsize, out_maxsize;
+	int out_format = 0, out_minsize = 0, out_maxsize = 0;
 	int do_init_filters = 1;
 	switch(mux_a->codec){
 		case ACODEC_COPY:
@@ -1209,7 +1209,6 @@
 		case ACODEC_PCM:
 			mp_msg(MSGT_MENCODER, MSGL_INFO, MSGTR_CBRPCMAudioSelected);
 			out_format = (mux_a->wf->wBitsPerSample==8) ? AF_FORMAT_U8 : AF_FORMAT_S16_LE;
-			out_bps = mux_a->wf->wBitsPerSample/8;
 			out_minsize = 16384;
 			out_maxsize = mux_a->wf->nAvgBytesPerSec;
 			break;
@@ -1217,7 +1216,6 @@
 		case ACODEC_VBRMP3:
 			mp_msg(MSGT_FIXME, MSGL_FIXME, MSGTR_MP3AudioSelected);
 			out_format = AF_FORMAT_S16_NE;
-			out_bps = 2;
 			out_minsize = 4608;
 			out_maxsize = mux_a->h.dwRate*mux_a->wf->nChannels*2;
 			break;
@@ -1225,7 +1223,6 @@
 #ifdef USE_LIBAVCODEC
 		case ACODEC_LAVC:
 			out_format = AF_FORMAT_S16_NE;
-			out_bps = 2;
 			out_minsize = mux_a->h.dwSuggestedBufferSize;
 			out_maxsize = mux_a->h.dwSuggestedBufferSize*2;
 			mp_msg(MSGT_MENCODER, MSGL_V, "FRAME_SIZE: %d, BUFFER_SIZE: %d, TAG: 0x%x\n",
@@ -1235,7 +1232,6 @@
 #ifdef HAVE_TOOLAME
 		case ACODEC_TOOLAME:
 			out_format = AF_FORMAT_S16_NE;
-			out_bps = 2;
 			out_minsize = mux_a->h.dwSuggestedBufferSize;
 			out_maxsize = mux_a->h.dwSuggestedBufferSize*2;
 			break;
@@ -1247,9 +1243,9 @@
 	    sh_audio->sample_format,
 	    mux_a->wf->nSamplesPerSec,
 	    mux_a->wf->nChannels,
-	    AF_FORMAT_S16_NE,
-	    4608,
-	    mux_a->h.dwRate*mux_a->wf->nChannels*2))
+	    out_format,
+	    out_minsize,
+	    out_maxsize))
 	{
 		mp_msg(MSGT_CPLAYER, MSGL_FATAL, MSGTR_NoMatchingFilter);
 		exit(1);