Mercurial > mplayer.hg
changeset 33910:645a13a163a6
Try using sh_video->pts instead of v_muxer_time for filter timestamp.
This works with -ss and is consistent with update_subtitles.
We will see what if any issues this solution has.
| author | reimar |
|---|---|
| date | Thu, 18 Aug 2011 18:37:07 +0000 |
| parents | 50489783444d |
| children | 552f50c89163 |
| files | mencoder.c |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mencoder.c Thu Aug 18 18:32:53 2011 +0000 +++ b/mencoder.c Thu Aug 18 18:37:07 2011 +0000 @@ -1456,8 +1456,11 @@ ((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); - // 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);} + // NOTE: sh_video->pts is not really correct, but it allows -ass to work mostly + // v_muxer_time was tried before, but it is completely off when -ss is used + // (see bug #1960). + // If you change this please not the reason here! + blit_frame = decoded_frame && filter_video(sh_video, decoded_frame, sh_video->pts);} v_muxer_time = adjusted_muxer_time(mux_v); // update after muxing if (sh_video->vf_initialized < 0) mencoder_exit(1, NULL);