demux: mkv: handle mkv-use-chapter-codec option

For safety reasons some users may not want to handle any chapter codec.
The option was added 8697e6ef99ef0cec90bcf515052e5de1c09601ce but
never implemented.

(cherry picked from commit 4b479fb554cf1474fc549334459512b0b096dbcc)

Gbp-Pq: Name 0059-demux-mkv-handle-mkv-use-chapter-codec-option.patch

diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp
index 706733e02b6a7f919e3e07ce50a22d71e4ac71f7..b9a2d2791ca46f641d37d7fb944ae2a240ac1fcc 100644 (file)
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -1257,6 +1257,9 @@ void matroska_segment_c::ParseChapterAtom( int i_level, KaxChapterAtom *ca, chap
         {
             debug( vars, "ChapterProcess" );
 
+            if ( !var_InheritBool( vars.p_demuxer, "mkv-use-chapter-codec") )
+                return;
+
             chapter_codec_cmds_c *p_ccodec = NULL;
 
             for( size_t j = 0; j < cp.ListSize(); j++ )