[vlc-devel] [PATCH] Handle possible negative timestamps in MKV

[Rémi Denis-Courmont]

On Tue, 20 Nov 2012 02:05:50 +0100, Denis Charmet <typx at dinauz.org> wrote:
> Fix #7751

I would use INT64_C() instead of a cast, but OK.

> ---
>  modules/demux/mkv/mkv.cpp |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
> index 6834367..1efa368 100644
> --- a/modules/demux/mkv/mkv.cpp
> +++ b/modules/demux/mkv/mkv.cpp
> @@ -722,9 +722,9 @@ static int Demux( demux_t *p_demux)
>          }
>  
>          if( simpleblock != NULL )
> -            p_sys->i_pts = p_sys->i_chapter_time + (
> simpleblock->GlobalTimecode() / (mtime_t) 1000 );
> +            p_sys->i_pts = p_sys->i_chapter_time + (
> (mtime_t)simpleblock->GlobalTimecode() / (mtime_t) 1000 );
>          else
> -            p_sys->i_pts = p_sys->i_chapter_time + (
> block->GlobalTimecode() / (mtime_t) 1000 );
> +            p_sys->i_pts = p_sys->i_chapter_time + (
> (mtime_t)block->GlobalTimecode() / (mtime_t) 1000 );
>  
>          mtime_t i_pcr = VLC_TS_INVALID;
>          for( size_t i = 0; i < p_segment->tracks.size(); i++)

-- 
Rémi Denis-Courmont
Sent from my collocated server