From 40a4fd63daaa4e4ec1a1b0ce4a23c876c60185c7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo@beauzee.fr>
Date: Tue, 27 Feb 2018 18:01:40 +0100
Subject: [PATCH] demux-run: Re-add MKV to the list of fuzzer modules

But only when MKV is enabled.
reverts e75e49c039f093a682823f715990bd5ce3dfa198.
---
 test/Makefile.am           | 4 ++++
 test/src/input/demux-run.c | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/test/Makefile.am b/test/Makefile.am
index e7b5165835..9668821507 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -198,6 +198,10 @@ if HAVE_DVBPSI
 libvlc_demux_run_la_CPPFLAGS += -DHAVE_DVBPSI
 libvlc_demux_run_la_LIBADD += ../modules/libts_plugin.la
 endif
+if HAVE_MATROSKA
+libvlc_demux_run_la_CPPFLAGS += -DHAVE_MATROSKA
+libvlc_demux_run_la_LIBADD += ../modules/libmkv_plugin.la
+endif
 endif
 EXTRA_LTLIBRARIES = libvlc_demux_run.la
 
diff --git a/test/src/input/demux-run.c b/test/src/input/demux-run.c
index 5f5efa59dd..416436fcf1 100644
--- a/test/src/input/demux-run.c
+++ b/test/src/input/demux-run.c
@@ -402,6 +402,7 @@ extern vlc_plugin_cb vlc_static_modules[];
     f(flacsys) \
     f(h26x) \
     f(mjpeg) \
+    PLUGIN_MKV(f) \
     f(mp4) \
     f(nsc) \
     f(nsv) \
@@ -440,6 +441,12 @@ extern vlc_plugin_cb vlc_static_modules[];
 # define PLUGIN_TS(f)
 #endif
 
+#ifdef HAVE_MATROSKA
+# define PLUGIN_MKV(f) f(mkv)
+#else
+# define PLUGIN_MKV(f)
+#endif
+
 #define DECL_PLUGIN(p) \
     int vlc_entry__##p(int (*)(void *, void *, int, ...), void *);
 
-- 
2.11.4.GIT