diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-28 12:51:05 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-28 12:51:05 +0000 |
| commit | 526ddd9235a08146641ce6d198ceff636c433367 (patch) | |
| tree | 67f7321e8cc84a2acc9c2c95764179d923976c7b /mencoder.c | |
| parent | 3dadd4325792af942c469733c81a27b80e7779b1 (diff) | |
| download | mpv-526ddd9235a08146641ce6d198ceff636c433367.tar.bz2 mpv-526ddd9235a08146641ce6d198ceff636c433367.tar.xz | |
"MPlayer does the right thing, presents frame 9 for 1.1 seconds, and continues
with frame 20. MEncoder calculates the right "frame_time", but duplicates the
frame following the gap, i.e. frame 20 is presented for 1.1 seconds."
patch by Jan Kritzner <kritzner@i4.informatik.rwth-aachen.de>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8599 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mencoder.c b/mencoder.c index 8f4c498cfd..63d6b4d90d 100644 --- a/mencoder.c +++ b/mencoder.c @@ -1017,6 +1017,8 @@ if(sh_audio){ if(in_size<0){ at_eof=1; break; } sh_video->timer+=frame_time; ++decoded_frameno; + v_timer_corr-=frame_time-(float)mux_v->h.dwScale/mux_v->h.dwRate; + if(demuxer2){ // 3-pass encoding, read control file (frameno.avi) // find our frame: while(next_frameno<decoded_frameno){ @@ -1070,8 +1072,6 @@ if( (v_pts_corr>=(float)mux_v->h.dwScale/mux_v->h.dwRate && skip_flag<0) } // demuxer2 -v_timer_corr-=frame_time-(float)mux_v->h.dwScale/mux_v->h.dwRate; - ptimer_start = GetTimerMS(); switch(mux_v->codec){ |