demux: mkv: move mp4 include off top level

2afb8fbc · Francois Cartegnie · ff7f5020 · 2afb8fbc · 2afb8fbc
Commit 2afb8fbc authored Sep 27, 2014 by Francois Cartegnie
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

modules/demux/mkv/matroska_segment_parse.cpp modules/demux/mkv/matroska_segment_parse.cpp +1 -0

modules/demux/mkv/mkv.hpp modules/demux/mkv/mkv.hpp +0 -3

No files found.
--- 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>

--- 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