vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Mar 27 22:42:28 2013 +0200| [843b6da8856871842c516908c9e6fe829b5ee76e] | committer: Rémi Denis-Courmont
mkv: mostly useless #include > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=843b6da8856871842c516908c9e6fe829b5ee76e --- modules/demux/mkv/demux.cpp | 2 ++ modules/demux/mkv/mkv.hpp | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp index 3a80975..a8235f7 100644 --- a/modules/demux/mkv/demux.cpp +++ b/modules/demux/mkv/demux.cpp @@ -27,6 +27,8 @@ #include "stream_io_callback.hpp" #include "Ebml_parser.hpp" +#include <vlc_keys.h> + event_thread_t::event_thread_t(demux_t *p_demux) : p_demux(p_demux) { vlc_mutex_init( &lock ); diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp index 6d6fbc8..efc88b3 100644 --- a/modules/demux/mkv/mkv.hpp +++ b/modules/demux/mkv/mkv.hpp @@ -96,8 +96,6 @@ #include "ebml/StdIOCallback.h" -#include <vlc_keys.h> - extern "C" { #include "../mp4/libmp4.h" } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
