[vlc-commits] Fix the subtitles loss at MKV segment changes

[Denis Charmet]

vlc/vlc-1.2 | branch: master | Denis Charmet <typx at dinauz.org> | Thu Jan 12 21:22:43 2012 +0100| [1cba7788e50804e696abaeec0e26f257395da752] | committer: Jean-Baptiste Kempf

Fix the subtitles loss at MKV segment changes

This patch add the new es before deleting the old ones which causes
the default sub track to be used according to user preferences.

Fix #5625.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit fa0dc29afabea001cf21db04766b003e5cf7845e)

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

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=1cba7788e50804e696abaeec0e26f257395da752
---

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

diff --git a/modules/demux/mkv/virtual_segment.cpp b/modules/demux/mkv/virtual_segment.cpp
index 623fbce..0f667f2 100644
--- a/modules/demux/mkv/virtual_segment.cpp
+++ b/modules/demux/mkv/virtual_segment.cpp
@@ -450,9 +450,9 @@ void virtual_segment_c::Seek( demux_t & demuxer, mtime_t i_date, mtime_t i_time_
 
         if( p_current_chapter->p_segment != p_chapter->p_segment )
         {
-            p_current_chapter->p_segment->UnSelect();
             es_out_Control( demuxer.out, ES_OUT_RESET_PCR );
             p_chapter->p_segment->Select( i_date );
+            p_current_chapter->p_segment->UnSelect();
         }
         p_current_chapter = p_chapter;