vlc | branch: master | Francois Cartegnie <[email protected]> | Thu Nov 10 12:20:33 2016 +0100| [4aeb7fd29f5b6ed2d597633c30719296b0236cb5] | committer: Francois Cartegnie
demux: ts: convert for unsigned stream_Tell > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4aeb7fd29f5b6ed2d597633c30719296b0236cb5 --- modules/demux/mpeg/ts.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/demux/mpeg/ts.c b/modules/demux/mpeg/ts.c index 40fa287..f5de1aa 100644 --- a/modules/demux/mpeg/ts.c +++ b/modules/demux/mpeg/ts.c @@ -882,7 +882,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) if( (i64 = stream_Size( p_sys->stream) ) > 0 ) { - int64_t offset = vlc_stream_Tell( p_sys->stream ); + uint64_t offset = vlc_stream_Tell( p_sys->stream ); *pf = (double)offset / (double)i64; return VLC_SUCCESS; } @@ -1630,9 +1630,9 @@ static block_t* ReadTSPacket( demux_t *p_demux ) { int64_t size = stream_Size( p_sys->stream ); if( size >= 0 && (uint64_t)size == vlc_stream_Tell( p_sys->stream ) ) - msg_Dbg( p_demux, "EOF at %"PRId64, vlc_stream_Tell( p_sys->stream ) ); + msg_Dbg( p_demux, "EOF at %"PRIu64, vlc_stream_Tell( p_sys->stream ) ); else - msg_Dbg( p_demux, "Can't read TS packet at %"PRId64, vlc_stream_Tell(p_sys->stream) ); + msg_Dbg( p_demux, "Can't read TS packet at %"PRIu64, vlc_stream_Tell(p_sys->stream) ); return NULL; } @@ -2008,7 +2008,7 @@ static int ProbeChunk( demux_t *p_demux, int i_program, bool b_end, int64_t *pi_ int ProbeStart( demux_t *p_demux, int i_program ) { demux_sys_t *p_sys = p_demux->p_sys; - const int64_t i_initial_pos = vlc_stream_Tell( p_sys->stream ); + const uint64_t i_initial_pos = vlc_stream_Tell( p_sys->stream ); int64_t i_stream_size = stream_Size( p_sys->stream ); int i_probe_count = 0; @@ -2039,7 +2039,7 @@ int ProbeStart( demux_t *p_demux, int i_program ) int ProbeEnd( demux_t *p_demux, int i_program ) { demux_sys_t *p_sys = p_demux->p_sys; - const int64_t i_initial_pos = vlc_stream_Tell( p_sys->stream ); + const uint64_t i_initial_pos = vlc_stream_Tell( p_sys->stream ); int64_t i_stream_size = stream_Size( p_sys->stream ); int i_probe_count = PROBE_CHUNK_COUNT; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
