[MPlayer-cvslog] CVS: main mencoder.c,1.307,1.308

[Oded Shimon CVS]

CVS change done by Oded Shimon CVS

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

Modified Files:
	mencoder.c 
Log Message:
fix mencoder multi-file with some files having audio but others dont


Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -r1.307 -r1.308
--- mencoder.c	8 Oct 2005 17:21:00 -0000	1.307
+++ mencoder.c	13 Oct 2005 19:30:06 -0000	1.308
@@ -948,7 +948,12 @@
 
 timer_start=GetTimerMS();
 } // if (!curfile) // if this was the first file.
-else if (sh_audio) {
+else {
+if (!mux_a != !sh_audio) {
+	mp_msg(MSGT_MENCODER,MSGL_FATAL,MSGTR_NoAudioFileMismatch);
+	mencoder_exit(1,NULL);
+}
+if (sh_audio) {
 	int out_format = 0, out_minsize = 0, out_maxsize = 0;
 	int do_init_filters = 1;
 	if((aencoder != NULL) && (mux_a->codec != ACODEC_COPY))
@@ -1011,6 +1016,7 @@
 	  mux_a->wf->nChannels = out_channels;
 	}
 }
+}
 
 parse_end_at();