Mercurial > mplayer.hg

diff mencoder.c @ 31558:a3a50df246f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move the subtitle pts handling code to demuxer.c This also fixes endpts using first->endpts instead of current->endpts and the move should avoid missing such fixes in the future by having all related code in one place.
author reimar
date Fri, 02 Jul 2010 21:14:42 +0000
parents 823f39ab650b
children 55dacfca4a43
line wrap: on
line diff
--- a/mencoder.c	Fri Jul 02 19:59:02 2010 +0000
+++ b/mencoder.c	Fri Jul 02 21:14:42 2010 +0000
@@ -1659,7 +1659,7 @@
  if(vobsub_writer){
      unsigned char* packet=NULL;
      int len;
-     while((len=ds_get_packet_sub(d_dvdsub,&packet))>0){
+     while((len=ds_get_packet_sub(d_dvdsub,&packet, NULL, NULL))>0){
 	 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);
 	     vobsub_out_output(vobsub_writer,packet,len,mux_v->timer + d_dvdsub->pts - sh_video->pts);
      }