[vlc-commits] [Git][videolan/vlc][3.0.x] 3 commits: demux: mkv: remove useless include

[Felix Paul Kühne (@fkuehne)]

Felix Paul Kühne pushed to branch 3.0.x at VideoLAN / VLC


Commits:
baa4adee by Zhao Zhili at 2026-03-19T09:23:52+01:00
demux: mkv: remove useless include

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
(cherry picked from commit 2e621ec0b12b179317b5f6ff9f501bf9f401a0fa)

- - - - -
ee8a8bf7 by Steve Lhomme at 2026-03-19T09:23:52+01:00
demux/mkv: include external headers with <>

(cherry picked from commit fd9220f206e6f2623af1d863fec2e6549dba8fb1) (edited)
edited:
- mkv.hpp doesn't have the includes as in VLC 4

- - - - -
217bbf04 by Steve Lhomme at 2026-03-19T09:23:52+01:00
demux: mkv: remove unused vlc_threads.h

(cherry picked from commit 41a33c7e3dd9585fafb4c183091450c615beea01)

- - - - -


2 changed files:

- modules/demux/mkv/Ebml_dispatcher.hpp
- modules/demux/mkv/mkv.hpp


Changes:

=====================================
modules/demux/mkv/Ebml_dispatcher.hpp
=====================================
@@ -25,10 +25,8 @@
 
 #include "dispatcher.hpp"
 
-#include "ebml/EbmlElement.h"
-#include "ebml/EbmlId.h"
-
-#include <vlc_threads.h>
+#include <ebml/EbmlElement.h>
+#include <ebml/EbmlId.h>
 
 #include <algorithm>
 #include <typeinfo>


=====================================
modules/demux/mkv/mkv.hpp
=====================================
@@ -56,39 +56,35 @@
 #include <stdexcept>
 
 /* libebml and matroska */
-#include "ebml/EbmlHead.h"
-#include "ebml/EbmlSubHead.h"
-#include "ebml/EbmlStream.h"
-#include "ebml/EbmlContexts.h"
-#include "ebml/EbmlVoid.h"
-#include "ebml/EbmlVersion.h"
-#include "ebml/StdIOCallback.h"
-
-#include "matroska/KaxAttachments.h"
-#include "matroska/KaxAttached.h"
-#include "matroska/KaxBlock.h"
-#include "matroska/KaxBlockData.h"
-#include "matroska/KaxChapters.h"
-#include "matroska/KaxCluster.h"
-#include "matroska/KaxClusterData.h"
-#include "matroska/KaxContexts.h"
-#include "matroska/KaxCues.h"
-#include "matroska/KaxCuesData.h"
-#include "matroska/KaxInfo.h"
-#include "matroska/KaxInfoData.h"
-#include "matroska/KaxSeekHead.h"
-#include "matroska/KaxSegment.h"
-#include "matroska/KaxTag.h"
-#include "matroska/KaxTags.h"
-//#include "matroska/KaxTagMulti.h"
-#include "matroska/KaxTracks.h"
-#include "matroska/KaxTrackAudio.h"
-#include "matroska/KaxTrackVideo.h"
-#include "matroska/KaxTrackEntryData.h"
-#include "matroska/KaxContentEncoding.h"
-#include "matroska/KaxVersion.h"
-
-#include "ebml/StdIOCallback.h"
+#include <ebml/EbmlHead.h>
+#include <ebml/EbmlSubHead.h>
+#include <ebml/EbmlStream.h>
+#include <ebml/EbmlContexts.h>
+#include <ebml/EbmlVoid.h>
+#include <ebml/EbmlVersion.h>
+
+#include <matroska/KaxAttachments.h>
+#include <matroska/KaxAttached.h>
+#include <matroska/KaxBlock.h>
+#include <matroska/KaxBlockData.h>
+#include <matroska/KaxChapters.h>
+#include <matroska/KaxCluster.h>
+#include <matroska/KaxClusterData.h>
+#include <matroska/KaxContexts.h>
+#include <matroska/KaxCues.h>
+#include <matroska/KaxCuesData.h>
+#include <matroska/KaxInfo.h>
+#include <matroska/KaxInfoData.h>
+#include <matroska/KaxSeekHead.h>
+#include <matroska/KaxSegment.h>
+#include <matroska/KaxTag.h>
+#include <matroska/KaxTags.h>
+#include <matroska/KaxTracks.h>
+#include <matroska/KaxTrackAudio.h>
+#include <matroska/KaxTrackVideo.h>
+#include <matroska/KaxTrackEntryData.h>
+#include <matroska/KaxContentEncoding.h>
+#include <matroska/KaxVersion.h>
 
 #ifdef HAVE_ZLIB_H
 #   include <zlib.h>



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/423c5aa026fab52e3e2c501c2d48d7ce50ae84e1...217bbf046d702f431f7e8923cc94372819b090b1

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/423c5aa026fab52e3e2c501c2d48d7ce50ae84e1...217bbf046d702f431f7e8923cc94372819b090b1
You're receiving this email because of your account on code.videolan.org.