Commit 02c82b36 authored by Christophe Mutricy's avatar Christophe Mutricy

Fix crash in MKV demuxer. Patch courtesy of Harry Sintonen. Fix #1006

parent a6916de1
......@@ -80,6 +80,7 @@ Goetz Waschk <waschk at informatik.uni-rostock dot de> - Mandrake packages
Haakon Meland Eriksen - Norwegian translation
Han HoJoong <0demon0 at paran dot com> - Korean translation
Hans-Peter Jansen <hpj at urpla.net> - patch for module options handling
Harry Sintonen <sintonen@iki.fi> - fix for MKV demuxer
Igor Helman - VLM msecseek command
Ilkka Ollakka - SDP bitrate patch, various VLM fixes
Jan Gerber <j at v2v dot org> - patch theora decoding aspect ratio
......
......@@ -5673,13 +5673,23 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset )
for( i_track = 0; i_track < tracks.size(); i_track++ )
{
#if LIBMATROSKA_VERSION >= 0x000800
if( (simpleblock && tracks[i_track]->i_number == simpleblock->TrackNum()) ||
(block && tracks[i_track]->i_number == block->TrackNum()) )
#else
if( tracks[i_track]->i_number == block->TrackNum() )
#endif
{
break;
}
}
sys.i_pts = (sys.i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000;
#if LIBMATROSKA_VERSION >= 0x000800
if( simpleblock )
sys.i_pts = (sys.i_chapter_time + simpleblock->GlobalTimecode()) / (mtime_t) 1000;
else
#endif
sys.i_pts = (sys.i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000;
if( i_track < tracks.size() )
{
......
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