[vlc-commits] demux: mkv: set es policy once

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sun Apr 15 09:16:18 2018 +0200| [082faa75cd764084bc923c41261acb8cfa3efd7a] | committer: Francois Cartegnie

demux: mkv: set es policy once

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

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

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index eb97a1a91a..009e1fc3d2 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -1089,8 +1089,6 @@ bool matroska_segment_c::ESCreate()
 {
     /* add all es */
     msg_Dbg( &sys.demuxer, "found %d es", static_cast<int>( tracks.size() ) );
-    es_out_Control( sys.demuxer.out, ES_OUT_SET_ES_CAT_POLICY, VIDEO_ES,
-                    ES_OUT_ES_POLICY_EXCLUSIVE );
 
     for( tracks_map_t::iterator it = tracks.begin(); it != tracks.end(); ++it )
     {
diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index 9f0926a43d..b1dc644f77 100644
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -114,6 +114,9 @@ static int Open( vlc_object_t * p_this )
     if ( vlc_stream_Control( p_demux->s, STREAM_CAN_FASTSEEK, &p_sys->b_fastseekable ) )
         p_sys->b_fastseekable = false;
 
+    es_out_Control( p_demux->out, ES_OUT_SET_ES_CAT_POLICY, VIDEO_ES,
+                    ES_OUT_ES_POLICY_EXCLUSIVE );
+
     p_stream = new matroska_stream_c( p_demux->s, false );
     if ( unlikely(p_stream == NULL) )
     {