diff options
| author | ods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-13 19:30:07 +0000 |
|---|---|---|
| committer | ods15 <ods15@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-10-13 19:30:07 +0000 |
| commit | c3ea61ff6c441f41637ac57b7e07205b630a940a (patch) | |
| tree | 56a736e87e608ef37b7867a32c5dee74c696a144 /mencoder.c | |
| parent | fc96ad08afc413574a37f52efa9522741c379cf8 (diff) | |
| download | mpv-c3ea61ff6c441f41637ac57b7e07205b630a940a.tar.bz2 mpv-c3ea61ff6c441f41637ac57b7e07205b630a940a.tar.xz | |
fix mencoder multi-file with some files having audio but others dont
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16753 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/mencoder.c b/mencoder.c index 16deef9af0..3ab52a56a8 100644 --- a/mencoder.c +++ b/mencoder.c @@ -948,7 +948,12 @@ signal(SIGPIPE,exit_sighandler); // broken pipe 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 @@ else if (sh_audio) { mux_a->wf->nChannels = out_channels; } } +} parse_end_at(); |