comparison mencoder.c @ 16752:425863aab3df

fix mencoder multi-file with some files having audio but others dont

16751:d9465442eef2

signal(SIGHUP,exit_sighandler);  // broken terminal line
signal(SIGPIPE,exit_sighandler); // broken pipe

timer_start=GetTimerMS();
} // if (!curfile) // if this was the first file.
else 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))
	{
		out_format = aencoder->input_format;

	}
	  mux_a->wf->nSamplesPerSec = out_srate;
	  mux_a->wf->nChannels = out_channels;
	}
}

parse_end_at();

if (seek_to_sec) {
    int a,b; float d;

16752:425863aab3df

signal(SIGHUP,exit_sighandler);  // broken terminal line
signal(SIGPIPE,exit_sighandler); // broken pipe

timer_start=GetTimerMS();
} // if (!curfile) // if this was the first file.
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))
	{
		out_format = aencoder->input_format;

	}
	  mux_a->wf->nSamplesPerSec = out_srate;
	  mux_a->wf->nChannels = out_channels;
	}
}
}

parse_end_at();

if (seek_to_sec) {
    int a,b; float d;