diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-16 23:03:06 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2003-01-16 23:03:06 +0000 |
| commit | 1637b36c9aa2bbe4c8d054b1ae8d852fba113c72 (patch) | |
| tree | c3468fd061e294aeee440b67cb3d7ec0b26eeedd /mencoder.c | |
| parent | bb561230652d8ff4961c0ef749304a24d47a9170 (diff) | |
| download | mpv-1637b36c9aa2bbe4c8d054b1ae8d852fba113c72.tar.bz2 mpv-1637b36c9aa2bbe4c8d054b1ae8d852fba113c72.tar.xz | |
10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8967 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mencoder.c b/mencoder.c index 6a1bd19414..270c06e4af 100644 --- a/mencoder.c +++ b/mencoder.c @@ -1144,7 +1144,7 @@ if(sh_audio && !demuxer2){ //printf("*** %5.3f ***\n",a_pts); a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; } - v_pts=d_video->pts; + v_pts=sh_video ? sh_video->pts : d_video->pts; // av = compensated (with out buffering delay) A-V diff AV_delay=(a_pts-v_pts); AV_delay-=mux_a->timer-(mux_v->timer-(v_timer_corr+v_pts_corr)); // compensate input video timer by av: @@ -1220,8 +1220,8 @@ if(sh_audio && !demuxer2){ #ifdef USE_SUB // find sub - if(subtitles && d_video->pts>0){ - float pts=d_video->pts; + if(subtitles && sh_video->pts>0){ + float pts=sh_video->pts; if(sub_fps==0) sub_fps=sh_video->fps; if (pts > sub_last_pts || pts < sub_last_pts-1.0 ) { find_sub(subtitles,sub_uses_time?(100*(pts+sub_delay)):((pts+sub_delay)*sub_fps)); // FIXME! frame counter... @@ -1236,14 +1236,14 @@ if(sh_audio && !demuxer2){ unsigned char* packet=NULL; int len; while((len=ds_get_packet_sub(d_dvdsub,&packet))>0){ - mp_msg(MSGT_MENCODER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f \n",len,d_video->pts,d_dvdsub->pts); + mp_msg(MSGT_MENCODER,MSGL_V,"\rDVD sub: len=%d v_pts=%5.3f s_pts=%5.3f \n",len,sh_video->pts,d_dvdsub->pts); if (vo_spudec) spudec_assemble(vo_spudec,packet,len,90000*d_dvdsub->pts); if (vobsub_writer) - vobsub_out_output(vobsub_writer,packet,len,mux_v->timer + d_dvdsub->pts - d_video->pts); + vobsub_out_output(vobsub_writer,packet,len,mux_v->timer + d_dvdsub->pts - sh_video->pts); } if (vo_spudec) { - spudec_heartbeat(vo_spudec,90000*d_video->pts); + spudec_heartbeat(vo_spudec,90000*sh_video->pts); vo_osd_changed(OSDTYPE_SPU); } } |