fixed track selection for mkv-files with default flag set on tracks.

diff --git a/TODO b/TODO
index 8f3ccb59f875e8ec14a2ad59552b518dea7a61e5..bd5ebeaf8ee73bbccc8c2901e84fc6b6c4806c0a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -167,7 +167,6 @@ Description: flash video playing/streaming
 A flash video muxer and demuxer. FFMPEG can already output flash video. a wast not to make use of that capability.\r
 Status: Todo\r
 \r
-Task\r
 Task\r
 Difficulty: Medium\r
 Urgency: Wishlist\r
@@ -498,7 +497,7 @@ Difficulty: Medium
 Platform: any\r
 Urgency: Normal\r
 Description: Update matroska demux\r
- Support default track flag\r
+ Better Seeking\r
  General bugfixes\r
 Status: Todo\r
 \r

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 8c259740f262bef4da641b2e0115862d504ef9c0..ae19a2c21485abb2f606564aed5780f99e17b134 100644 (file)
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -651,6 +651,10 @@ static int Open( vlc_object_t * p_this )
             msg_Err( p_demux, "unknow codec id=`%s'", tk.psz_codec );
             tk.fmt.i_codec = VLC_FOURCC( 'u', 'n', 'd', 'f' );
         }
+        if( tk.b_default )
+        {
+            tk.fmt.i_priority = 1000;
+        }
 
         tk.p_es = es_out_Add( p_demux->out, &tk.fmt );
 #undef tk