mkv.cpp: new options for the demuxer

fr.po: small translation fix

diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index e07858cd7db7788ead9894128e84ed2e775703de..75b4f2dfae32e9fe8a87e2bed0a835bab0c5372f 100644 (file)
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -121,7 +121,15 @@ vlc_module_begin();
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
 
-    add_bool( "mkv-seek-percent", 1, NULL,
+    add_bool( "mkv-use-ordered-chapters", 1, NULL,
+            N_("Ordered chapters"),
+            N_("Play chapters in the specified order as specified in the file"), VLC_TRUE );
+
+    add_bool( "mkv-use-chapter-codec", 1, NULL,
+            N_("Chapter codecs"),
+            N_("Use chapter codecs found in the file"), VLC_TRUE );
+
+    add_bool( "mkv-seek-percent", 0, NULL,
             N_("Seek based on percent not time"),
             N_("Seek based on percent not time"), VLC_TRUE );
 
@@ -3100,7 +3108,7 @@ void matroska_segment_t::ParseChapters( EbmlElement *chapters )
                 }
                 else if( MKV_IS_ID( l, KaxEditionFlagOrdered ) )
                 {
-                    edition.b_ordered = uint8(*static_cast<KaxEditionFlagOrdered *>( l )) != 0;
+                                       edition.b_ordered = config_GetInt( &sys.demuxer, "mkv-use-ordered-chapters" ) ? (uint8(*static_cast<KaxEditionFlagOrdered *>( l )) != 0) : 0;
                 }
                 else if( MKV_IS_ID( l, KaxEditionFlagDefault ) )
                 {

diff --git a/po/fr.po b/po/fr.po
index 8a9f9f0441990cb3183d3403e18c0136fb66ee92..20d8c045d574c978121524f313721dc8c691a09b 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -8093,7 +8093,7 @@ msgstr "Déplacements basés sur le pourcentage et non le temps"
 
 #: modules/demux/mkv.cpp:3043
 msgid "Segment filename"
-msgstr "Segment de nom de fichier"
+msgstr "Nom de fichier du Segment"
 
 #: modules/demux/mkv.cpp:3047
 msgid "Muxing application"