[vlc-commits] demux:mkv: use the parser we store in the payload

Steve Lhomme git at videolan.org
Thu Jan 25 17:39:37 CET 2018


vlc/vlc-3.0 | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Thu Jan 25 13:24:00 2018 +0100| [4b7d9eecb602bc64dc78962fb52aa1a3b696033e] | committer: Jean-Baptiste Kempf

demux:mkv: use the parser we store in the payload

rather than the one from another object

(cherry picked from commit 5158cdfe3abb256dea96062169e921b9ff4c03d1)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=4b7d9eecb602bc64dc78962fb52aa1a3b696033e
---

 modules/demux/mkv/matroska_segment.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index 9ad4ec70c0..8c002ed357 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -1211,14 +1211,14 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, KaxSimpleBlock * & pp_s
         }
         E_CASE( KaxClusterSilentTracks, ksilent )
         {
-            vars.obj->ep->Down ();
+            vars.ep->Down ();
 
             VLC_UNUSED( ksilent );
         }
         E_CASE( KaxBlockGroup, kbgroup )
         {
             vars.obj->i_block_pos = kbgroup.GetElementPosition();
-            vars.obj->ep->Down ();
+            vars.ep->Down ();
         }
         E_CASE( KaxSimpleBlock, ksblock )
         {
@@ -1259,7 +1259,7 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, KaxSimpleBlock * & pp_s
                     SegmentSeeker::Seekpoint( kblock.GetElementPosition(), kblock.GlobalTimecode() / 1000 ) );
             }
 
-            vars.obj->ep->Keep ();
+            vars.ep->Keep ();
         }
         E_CASE( KaxBlockDuration, kduration )
         {



More information about the vlc-commits mailing list