modules: use the new add_shortcut capability (add multiple shortcuts at a time).

[vlc] / modules / demux / vobsub.c

diff --git a/modules/demux/vobsub.c b/modules/demux/vobsub.c
index 4b902d357fa9963c9f887975d3e8d3b2209a7c2e..f8283db8d7854bc2c67f6f6aba3566274bf7b6cd 100644 (file)
--- a/modules/demux/vobsub.c
+++ b/modules/demux/vobsub.c
@@ -32,12 +32,10 @@
 #include <vlc_common.h>
 #include <vlc_plugin.h>
 
-#include <errno.h>
 #include <sys/types.h>
 #include <limits.h>
 
 #include <vlc_demux.h>
-#include <vlc_charset.h>
 
 #include "ps.h"
 #include "vobsub.h"
@@ -58,8 +56,7 @@ vlc_module_begin ()
 
     set_callbacks( Open, Close )
 
-    add_shortcut( "vobsub" )
-    add_shortcut( "subtitle" )
+    add_shortcut( "vobsub", "subtitle" )
 vlc_module_end ()
 
 /*****************************************************************************
@@ -408,7 +405,7 @@ static int Demux( demux_t *p_demux )
             p_block->i_buffer = i_read;
 
             /* pts */
-            p_block->i_pts = tk.p_subtitles[tk.i_current_subtitle].i_start;
+            p_block->i_pts = VLC_TS_0 + tk.p_subtitles[tk.i_current_subtitle].i_start;
 
             /* demux this block */
             DemuxVobSub( p_demux, p_block );
@@ -701,7 +698,7 @@ static int DemuxVobSub( demux_t *p_demux, block_t *p_bk )
             if( p_tk->p_es && p_tk->i_track_id == i_spu )
             {
                 es_out_Send( p_demux->out, p_tk->p_es, p_pkt );
-                p_bk->i_pts = 0;     /*only first packet has a pts */
+                p_bk->i_pts = VLC_TS_INVALID;     /*only first packet has a pts */
                 break;
             }
         }