Move MKV demuxer to its own subfolder.

configure.ac

@@ -5794,6 +5794,7 @@ AC_CONFIG_FILES([
   modules/demux/asf/Makefile
   modules/demux/avformat/Makefile
   modules/demux/avi/Makefile
+  modules/demux/mkv/Makefile
   modules/demux/mp4/Makefile
   modules/demux/mpeg/Makefile
   modules/demux/playlist/Makefile

modules/demux/Modules.am

-SUBDIRS = asf avformat avi mp4 mpeg playlist
+SUBDIRS = asf avformat avi mkv mp4 mpeg playlist
 SOURCES_flacsys = flac.c
 SOURCES_ogg = ogg.c
 SOURCES_demuxdump = demuxdump.c
@@ -6,7 +6,6 @@ SOURCES_rawdv = rawdv.c
 SOURCES_rawvid = rawvid.c
 SOURCES_au = au.c
 SOURCES_wav = wav.c
-SOURCES_mkv = mkv.cpp mp4/libmp4.c mp4/drms.c
 SOURCES_live555 = live555.cpp ../access/mms/asf.c ../access/mms/buffer.c
 SOURCES_nsv = nsv.c
 SOURCES_real = real.c

modules/demux/mkv.cpp → modules/demux/mkv/mkv.cpp

@@ -101,7 +101,7 @@
 #include "vlc_keys.h"
 
 extern "C" {
-   #include "mp4/libmp4.h"
+   #include "../mp4/libmp4.h"
 }
 #ifdef HAVE_ZLIB_H
 #   include <zlib.h>