[vlc-commits] demux:mpeg: ps_pkt_parse_pack() explicitly gives a vlc_tick_t

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Tue Sep 18 09:08:17 2018 +0200| [1d4ba62f469037aa224e580d3d86c4b4a1601646] | committer: Steve Lhomme

demux:mpeg: ps_pkt_parse_pack() explicitly gives a vlc_tick_t

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1d4ba62f469037aa224e580d3d86c4b4a1601646
---

 modules/access/dvdnav.c  | 2 +-
 modules/access/dvdread.c | 2 +-
 modules/demux/mpeg/ps.c  | 6 +++---
 modules/demux/mpeg/ps.h  | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 8992b781ea..19e3afc40d 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -1388,7 +1388,7 @@ static int DemuxBlock( demux_t *p_demux, const uint8_t *p, int len )
 
         case 0x1ba:
         {
-            int64_t i_scr;
+            vlc_tick_t i_scr;
             int i_mux_rate;
             if( !ps_pkt_parse_pack( p_pkt, &i_scr, &i_mux_rate ) )
             {
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index beddd331e1..927137e021 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -618,7 +618,7 @@ static int DemuxBlock( demux_t *p_demux, const uint8_t *p, int len )
 
         case 0x1ba:
         {
-            int64_t i_scr;
+            vlc_tick_t i_scr;
             int i_mux_rate;
             if( !ps_pkt_parse_pack( p_pkt, &i_scr, &i_mux_rate ) )
             {
diff --git a/modules/demux/mpeg/ps.c b/modules/demux/mpeg/ps.c
index fdf663bbd1..dc3febfad0 100644
--- a/modules/demux/mpeg/ps.c
+++ b/modules/demux/mpeg/ps.c
@@ -87,8 +87,8 @@ typedef struct
     ps_psm_t    psm;
     ps_track_t  tk[PS_TK_COUNT];
 
-    int64_t     i_pack_scr; /* current read pack scr value, temp */
-    int64_t     i_first_scr; /* media offset */
+    vlc_tick_t  i_pack_scr; /* current read pack scr value, temp */
+    vlc_tick_t  i_first_scr; /* media offset */
     int64_t     i_scr; /* committed, current position */
     int64_t     i_scr_track_id;
     int         i_mux_rate;
@@ -322,7 +322,7 @@ static int Probe( demux_t *p_demux, bool b_end )
     }
     else if( i_id == PS_STREAM_ID_PACK_HEADER )
     {
-        int64_t i_scr; int dummy;
+        vlc_tick_t i_scr; int dummy;
         if( !b_end && !ps_pkt_parse_pack( p_pkt, &i_scr, &dummy ) )
         {
             if( p_sys->i_first_scr == -1 )
diff --git a/modules/demux/mpeg/ps.h b/modules/demux/mpeg/ps.h
index 84d4cb6920..3dc0598a83 100644
--- a/modules/demux/mpeg/ps.h
+++ b/modules/demux/mpeg/ps.h
@@ -430,7 +430,7 @@ static inline int ps_pkt_size( const uint8_t *p, int i_peek )
 }
 
 /* parse a PACK PES */
-static inline int ps_pkt_parse_pack( block_t *p_pkt, int64_t *pi_scr,
+static inline int ps_pkt_parse_pack( block_t *p_pkt, vlc_tick_t *pi_scr,
                                      int *pi_mux_rate )
 {
     uint8_t *p = p_pkt->p_buffer;