vlc | branch: master | Francois Cartegnie <[email protected]> | Sat Sep 27 19:16:17 2014 +0200| [2afb8fbc9b09c9df33228c79ba342645fb8c5cd4] | committer: Francois Cartegnie
demux: mkv: move mp4 include off top level > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2afb8fbc9b09c9df33228c79ba342645fb8c5cd4 --- modules/demux/mkv/matroska_segment_parse.cpp | 1 + modules/demux/mkv/mkv.hpp | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp index 975b053..d1943e5 100644 --- a/modules/demux/mkv/matroska_segment_parse.cpp +++ b/modules/demux/mkv/matroska_segment_parse.cpp @@ -32,6 +32,7 @@ extern "C" { #include "../vobsub.h" #include "../xiph.h" #include "../windows_audio_commons.h" +#include "../mp4/libmp4.h" } #include <vlc_codecs.h> diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp index 0638914..8c5af80 100644 --- a/modules/demux/mkv/mkv.hpp +++ b/modules/demux/mkv/mkv.hpp @@ -97,9 +97,6 @@ #include "ebml/StdIOCallback.h" -extern "C" { - #include "../mp4/libmp4.h" -} #ifdef HAVE_ZLIB_H # include <zlib.h> #endif _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
