Changeset 02c82b36dc009c3cb2c09058ae73c40d4a1485a0

Show
Ignore:
Timestamp:
05/10/07 00:49:10 (1 year ago)
Author:
Christophe Mutricy <xtophe@videolan.org>
git-committer:
Christophe Mutricy <xtophe@videolan.org> 1178750950 +0000
git-parent:

[a6916de10111532d61ecee3a23dff3579e263292]

git-author:
Christophe Mutricy <xtophe@videolan.org> 1178750950 +0000
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • THANKS

    re3b4a2c r02c82b3  
    8181Han HoJoong <0demon0 at paran dot com> - Korean translation 
    8282Hans-Peter Jansen <hpj at urpla.net> - patch for module options handling 
     83Harry Sintonen <sintonen@iki.fi> - fix for MKV demuxer 
    8384Igor Helman - VLM msecseek command 
    8485Ilkka Ollakka - SDP bitrate patch, various VLM fixes 

  • modules/demux/mkv.cpp

    rcbc9069 r02c82b3  
    56745674        for( i_track = 0; i_track < tracks.size(); i_track++ ) 
    56755675        { 
     5676#if LIBMATROSKA_VERSION >= 0x000800 
     5677            if( (simpleblock && tracks[i_track]->i_number == simpleblock->TrackNum()) || 
     5678                (block && tracks[i_track]->i_number == block->TrackNum()) ) 
     5679#else 
    56765680            if( tracks[i_track]->i_number == block->TrackNum() ) 
     5681#endif 
    56775682            { 
    56785683                break; 
    …… 
    56805685        } 
    56815686 
    5682         sys.i_pts = (sys.i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000; 
     5687#if LIBMATROSKA_VERSION >= 0x000800 
     5688        if( simpleblock ) 
     5689            sys.i_pts = (sys.i_chapter_time + simpleblock->GlobalTimecode()) / (mtime_t) 1000; 
     5690        else 
     5691#endif 
     5692            sys.i_pts = (sys.i_chapter_time + block->GlobalTimecode()) / (mtime_t) 1000; 
    56835693 
    56845694        if( i_track < tracks.size() )