Commit 8e13a232 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Move MKV demuxer to its own subfolder.

parent e4e9bad7
......@@ -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
......
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
......
......@@ -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>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment