Commit b7b09037 authored by Dennis van Amerongen's avatar Dennis van Amerongen

* modules/demux/mkv.cpp: backport [20041], Fix im MKV demuxer.

parent 1ff768ee
...@@ -73,6 +73,7 @@ Goetz Waschk <waschk at informatik.uni-rostock dot de> - Mandrake packages ...@@ -73,6 +73,7 @@ Goetz Waschk <waschk at informatik.uni-rostock dot de> - Mandrake packages
Haakon Meland Eriksen - Norwegian translation Haakon Meland Eriksen - Norwegian translation
Han HoJoong <0demon0 at paran dot com> - Korean translation Han HoJoong <0demon0 at paran dot com> - Korean translation
Hans-Peter Jansen <hpj at urpla.net> - patch for module options handling Hans-Peter Jansen <hpj at urpla.net> - patch for module options handling
Harry Sintonen <sintonen at iki dot fi> - fix for MKV demuxer
Ilkka Ollakka - SDP bitrate patch Ilkka Ollakka - SDP bitrate patch
Jan Gerber <j at v2v dot org> - patch theora decoding aspect ratio Jan Gerber <j at v2v dot org> - patch theora decoding aspect ratio
Jan Van Boghout <vlc at macrabbit.com> - iTunes like slider for OSX intf Jan Van Boghout <vlc at macrabbit.com> - iTunes like slider for OSX intf
......
...@@ -5599,13 +5599,23 @@ void matroska_segment_c::Seek( mtime_t i_date, mtime_t i_time_offset ) ...@@ -5599,13 +5599,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++ ) 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() ) if( tracks[i_track]->i_number == block->TrackNum() )
#endif
{ {
break; 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() ) 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