[vlc-commits] commit: Fixed mkv seeking regression while adding simpleblock support. ( Laurent Aimar )

git at videolan.org git at videolan.org
Thu Apr 22 00:02:29 CEST 2010


vlc/vlc-1.1 | branch: master | Laurent Aimar <fenrir at videolan.org> | Wed Apr 21 20:28:13 2010 +0200| [e40bf9c6a93ac0fc86cca9ca0dccd9bd9bf93e80] | committer: Jean-Baptiste Kempf 

Fixed mkv seeking regression while adding simpleblock support.
(cherry picked from commit aa4b22e8cb36212724fc3dab0aa7586f175bc97e)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=e40bf9c6a93ac0fc86cca9ca0dccd9bd9bf93e80
---

 modules/demux/mkv/matroska_segment.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index 13271cf..0267696 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -1405,7 +1405,7 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, KaxSimpleBlock * & pp_s
 
                 ref.ReadData( es.I_O() );
 
-                if( int64( ref ) < 0 )
+                if( *pb_key_picture )
                     *pb_key_picture = false;
                 else if( int64( ref ) > 0 )
                     *pb_discardable_picture = true;



More information about the vlc-commits mailing list