Skip to content

V
vlc-1.1
Commit cfb2689c authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* matroska bug. don't use block, in case when it can be ( block || simpleblock)

parent ed239bba
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/demux/mkv.cpp
View file @ cfb2689c
...@@ -1887,12 +1887,12 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts, ...@@ -1887,12 +1887,12 @@ static void BlockDecode( demux_t *p_demux, KaxBlock *block, mtime_t i_pts,
if( i_track >= p_segment->tracks.size() ) if( i_track >= p_segment->tracks.size() )
{ {
msg_Err( p_demux, "invalid track number=%d", block->TrackNum() ); msg_Err( p_demux, "invalid track number" );
return; return;
} }
if( tk->fmt.i_cat != NAV_ES && tk->p_es == NULL ) if( tk->fmt.i_cat != NAV_ES && tk->p_es == NULL )
{ {
msg_Err( p_demux, "unknown track number=%d", block->TrackNum() ); msg_Err( p_demux, "unknown track number" );
return; return;
} }
if( i_pts + i_duration < p_sys->i_start_pts && tk->fmt.i_cat == AUDIO_ES ) if( i_pts + i_duration < p_sys->i_start_pts && tk->fmt.i_cat == AUDIO_ES )
......
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