[MPlayer-cvslog] r33920 - trunk/mencoder.c

[reimar]

Author: reimar
Date: Mon Jul 25 20:01:23 2011
New Revision: 33920

Log:
Pass a (half-made-up) timestamp to filter_video, this allows -ass to work.

Modified:
   trunk/mencoder.c

Modified: trunk/mencoder.c
==============================================================================
--- trunk/mencoder.c	Mon Jul 25 19:04:32 2011	(r33919)
+++ trunk/mencoder.c	Mon Jul 25 20:01:23 2011	(r33920)
@@ -1466,7 +1466,8 @@ default:
                       ((vf_instance_t *)sh_video->vfilter)->control(sh_video->vfilter, VFCTRL_SKIP_NEXT_FRAME, 0) != CONTROL_TRUE);
     void *decoded_frame = decode_video(sh_video,frame_data.start,frame_data.in_size,
                                        drop_frame, MP_NOPTS_VALUE, NULL);
-    blit_frame = decoded_frame && filter_video(sh_video, decoded_frame, MP_NOPTS_VALUE);}
+    // NOTE: v_muxer_time is not really correct, but it allows -ass to work mostly
+    blit_frame = decoded_frame && filter_video(sh_video, decoded_frame, v_muxer_time);}
     v_muxer_time = adjusted_muxer_time(mux_v); // update after muxing
 
     if (sh_video->vf_initialized < 0) mencoder_exit(1, NULL);