[vlc-commits] demux: mkv: only include what's needed in stream_io_callback

Zhao Zhili git at videolan.org
Mon May 28 10:11:50 CEST 2018


vlc | branch: master | Zhao Zhili <quinkblack at foxmail.com> | Mon May 28 15:00:37 2018 +0800| [d4d33b0526679065eb811b314f80162d453ed55e] | committer: Steve Lhomme

demux: mkv: only include what's needed in stream_io_callback

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

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

 modules/demux/mkv/stream_io_callback.cpp |  3 ---
 modules/demux/mkv/stream_io_callback.hpp | 10 +++++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/modules/demux/mkv/stream_io_callback.cpp b/modules/demux/mkv/stream_io_callback.cpp
index 6a50745f13..32e5692afb 100644
--- a/modules/demux/mkv/stream_io_callback.cpp
+++ b/modules/demux/mkv/stream_io_callback.cpp
@@ -24,9 +24,6 @@
 
 #include "stream_io_callback.hpp"
 
-#include "matroska_segment.hpp"
-#include "demux.hpp"
-
 /*****************************************************************************
  * Stream managment
  *****************************************************************************/
diff --git a/modules/demux/mkv/stream_io_callback.hpp b/modules/demux/mkv/stream_io_callback.hpp
index 519a1aefb5..d0621c5cf3 100644
--- a/modules/demux/mkv/stream_io_callback.hpp
+++ b/modules/demux/mkv/stream_io_callback.hpp
@@ -25,7 +25,15 @@
 #ifndef VLC_MKV_STREAM_IO_CALLBACK_HPP_
 #define VLC_MKV_STREAM_IO_CALLBACK_HPP_
 
-#include "mkv.hpp"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_demux.h>
+
+#include "ebml/IOCallback.h"
+
+using namespace LIBEBML_NAMESPACE;
 
 /*****************************************************************************
  * Stream managment



More information about the vlc-commits mailing list