Index: mencoder.c
===================================================================
--- mencoder.c	(r��vision 23694)
+++ mencoder.c	(copie de travail)
@@ -320,7 +320,25 @@
   }
 }
 
+//---------------------------------------------------------------------------
 
+static int read_video(sh_video_t *sh_video, s_frame_data * frame_data){
+    sh_video->last_pts = sh_video->pts;
+    frame_data->in_size = video_read_frame(sh_video, &frame_data->frame_time, &frame_data->start, force_fps);
+    if(frame_data->in_size<0)
+      return 0;
+    if(edl_seek_type && sh_video->last_pts >= sh_video->pts){
+      /* In slowseek, as all frames are read, sh_video->pts must always be equal to
+         sh_video->last_pts + frame_data->frame_time.
+         However, to be the least intrusive as possible, we only force sh_video->pts
+         when needed. */
+      sh_video->pts = sh_video->last_pts + frame_data->frame_time;
+    }
+    sh_video->timer += frame_data->frame_time;
+    frame_data->already_read = 1;
+    return 1;
+}
+
 //---------------------------------------------------------------------------
 
 static int dec_audio(sh_audio_t *sh_audio,unsigned char* buffer,int total){
@@ -1234,10 +1252,8 @@
 
     // get video frame!
 
-    if (!frame_data.already_read) {
-        frame_data.in_size=video_read_frame(sh_video,&frame_data.frame_time,&frame_data.start,force_fps);
-        sh_video->timer+=frame_data.frame_time;
-    }
+    if (!frame_data.already_read)
+        read_video(sh_video,&frame_data);
     frame_data.frame_time /= playback_speed;
     if(frame_data.in_size<0){ at_eof=1; break; }
     ++decoded_frameno;
@@ -1654,11 +1670,8 @@
     while (!interrupted) {
         float a_pts = 0.;
 
-        if (!frame_data->already_read) { // when called after fixdelay, a frame is already read
-            frame_data->in_size = video_read_frame(sh_video, &frame_data->frame_time, &frame_data->start, force_fps);
-            if(frame_data->in_size<0) return 2;
-            sh_video->timer += frame_data->frame_time;
-        }
+        if (!frame_data->already_read) // when called after fixdelay, a frame is already read
+            if (!read_video(sh_video,frame_data)) return 2;
         frame_data->already_read = 0;
 
         a_pts = forward_audio(sh_video->pts - frame_data->frame_time + audio_delay, d_audio, mux_a);
@@ -1696,10 +1709,7 @@
     // demux_seek has a weirdness that sh_video->pts is meaningless,
     // until a single frame is read... Same for audio actually too.
     // Reading one frame, and keeping it.
-    frame_data->in_size = video_read_frame(sh_video, &frame_data->frame_time, &frame_data->start, force_fps);
-    if(frame_data->in_size<0) return;
-    sh_video->timer += frame_data->frame_time;
-    frame_data->already_read = 1;
+    if (!read_video(sh_video, frame_data)) return;
 
     a_pts = forward_audio(sh_video->pts - frame_data->frame_time + audio_delay, d_audio, mux_a);
 
