diff options
| author | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-27 18:22:23 +0000 |
|---|---|---|
| committer | rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-02-27 18:22:23 +0000 |
| commit | 7f9401e34a9bbead832fa38f6bedfb484aec22d4 (patch) | |
| tree | d7046e7fdecb52e6f3ad7ba7a3110682c06990d9 /mencoder.c | |
| parent | 5e1784e5f935173ce371400dd3f9df9e8edfaf55 (diff) | |
| download | mpv-7f9401e34a9bbead832fa38f6bedfb484aec22d4.tar.bz2 mpv-7f9401e34a9bbead832fa38f6bedfb484aec22d4.tar.xz | |
Multifile 10l bugfix by Oded:
"I never checked merging 2 complete files...
at_eof stays non-zero when starting the second file, and doesn't encode a
single frame..."
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14846 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mencoder.c b/mencoder.c index 24c9eb913c..016dac2977 100644 --- a/mencoder.c +++ b/mencoder.c @@ -1740,6 +1740,8 @@ if (!interrupted && filelist[++curfile].name != 0) { prevwidth = mux_v->bih->biWidth; prevhieght = mux_v->bih->biHeight; + at_eof = 0; + m_config_pop(mconfig); goto play_next_file; } |