Commit 5ddc9ee3 authored by Francois Cartegnie's avatar Francois Cartegnie Committed by Jean-Baptiste Kempf

demux: mp4: fix integer overflow (fix #12074)

(cherry picked from commit 0ff2de0533d1197d2dc2f17ad9093cc7b9541402)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 73a6039b
...@@ -967,13 +967,14 @@ end: ...@@ -967,13 +967,14 @@ end:
continue; continue;
mtime_t i_dts = MP4_TrackGetDTS( p_demux, tk ); mtime_t i_dts = MP4_TrackGetDTS( p_demux, tk );
p_sys->i_pcr = __MIN( i_dts, p_sys->i_pcr );
if ( !p_sys->b_seekmode && i_dts > p_sys->i_pcr + 2*CLOCK_FREQ ) if ( !p_sys->b_seekmode && i_dts > p_sys->i_pcr + 2*CLOCK_FREQ )
{ {
msg_Dbg( p_demux, "that media doesn't look interleaved, will need to seek"); msg_Dbg( p_demux, "that media doesn't look interleaved, will need to seek");
p_sys->b_seekmode = true; p_sys->b_seekmode = true;
} }
p_sys->i_pcr = __MIN( i_dts, p_sys->i_pcr );
p_sys->i_time = p_sys->i_pcr * p_sys->i_timescale / CLOCK_FREQ; p_sys->i_time = p_sys->i_pcr * p_sys->i_timescale / CLOCK_FREQ;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment