Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.274
diff -u -r1.274 mencoder.c
--- mencoder.c	15 Mar 2005 04:10:57 -0000	1.274
+++ mencoder.c	20 Apr 2005 09:40:34 -0000
@@ -1492,6 +1492,13 @@
 
     in_size=video_read_frame(sh_video,&frame_time,&start,force_fps);
     if(in_size<0){ at_eof=1; break; }
+    #ifdef USE_LIBAVCODEC
+    {
+        AVRational q= av_d2q(force_ofps?force_ofps:sh_video->fps*playback_speed, 30000);
+        mux_v->h.dwScale= q.den;
+        mux_v->h.dwRate = q.num;
+    }
+    #endif
     sh_video->timer+=frame_time; ++decoded_frameno;
     frame_time /= playback_speed;
 
Index: libmpdemux/muxer_mpeg.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/muxer_mpeg.c,v
retrieving revision 1.15
diff -u -r1.15 muxer_mpeg.c
--- libmpdemux/muxer_mpeg.c	7 Mar 2005 07:36:27 -0000	1.15
+++ libmpdemux/muxer_mpeg.c	20 Apr 2005 09:40:34 -0000
@@ -2286,7 +2286,12 @@
   }
   
   s->size += len;
-  s->timer = (double)s->h.dwLength*s->h.dwScale/s->h.dwRate;
+  //fprintf(stderr, "\nSCALE: %d, RATE: %d\n", s->h.dwScale, s->h.dwRate);
+  if(s->type == MUXER_TYPE_AUDIO)
+    s->timer = (double)s->h.dwLength*s->h.dwScale/s->h.dwRate;
+  else
+    s->timer += (double) s->h.dwScale/ (double) s->h.dwRate;
+    
 
   //if genmpeg1/2 and sz > last buffer size in the system header we must write the new sysheader
   if(sz > s->h.dwSuggestedBufferSize) { // increase and set STD 
