Mercurial > mplayer.hg

changeset 33832:725b020e5c31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pass a (half-made-up) timestamp to filter_video, this allows -ass to work.
author reimar
date Mon, 25 Jul 2011 18:01:23 +0000
parents 93a85875e6ae
children 1e096f5e51c7
files mencoder.c
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mencoder.c	Mon Jul 25 17:04:32 2011 +0000
+++ b/mencoder.c	Mon Jul 25 18:01:23 2011 +0000
@@ -1466,7 +1466,8 @@
                       ((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);