[vlc-devel] commit: Move MKV demuxer to its own subfolder. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Sep 17 21:41:20 2008 -0700| [8e13a2327e3408f058197a000be4a54f7ae589e1] | committer: Jean-Baptiste Kempf 

Move MKV demuxer to its own subfolder.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8e13a2327e3408f058197a000be4a54f7ae589e1
---

 configure.ac                    |    1 +
 modules/demux/Modules.am        |    3 +--
 modules/demux/{ => mkv}/mkv.cpp |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index dd9b4f1..30e6728 100644
--- a/configure.ac
+++ b/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
diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index 8c979db..268dc08 100644
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -1,4 +1,4 @@
-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
diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv/mkv.cpp
similarity index 99%
rename from modules/demux/mkv.cpp
rename to modules/demux/mkv/mkv.cpp
index f5e5b35..1815457 100644
--- a/modules/demux/mkv.cpp
+++ b/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>