[vlc-commits] [Git][videolan/vlc][master] modules: fix some inconsistent #includes.

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
e41e3ea0 by Benjamin King at 2022-09-29T04:55:14+00:00
modules: fix some inconsistent #includes.

- - - - -


7 changed files:

- modules/access/rtp/input.c
- modules/access/rtp/rtp.c
- modules/codec/ttml/substtml.c
- modules/demux/adaptive/http/HTTPConnection.cpp
- modules/demux/adaptive/http/HTTPConnectionManager.cpp
- modules/demux/dash/DASHManager.cpp
- modules/video_output/apple/VLCCVOpenGLProvider.m


Changes:

=====================================
modules/access/rtp/input.c
=====================================
@@ -39,7 +39,7 @@
 #include <vlc_common.h>
 #include <vlc_demux.h>
 #include <vlc_block.h>
-#include <vlc_dtls.h>
+#include "vlc_dtls.h"
 
 #include "rtp.h"
 #ifdef HAVE_SRTP


=====================================
modules/access/rtp/rtp.c
=====================================
@@ -31,7 +31,7 @@
 #include <vlc_demux.h>
 #include <vlc_network.h>
 #include <vlc_plugin.h>
-#include <vlc_dtls.h>
+#include "vlc_dtls.h"
 #include <vlc_modules.h> /* module_exists() */
 
 #include "rtp.h"


=====================================
modules/codec/ttml/substtml.c
=====================================
@@ -35,7 +35,7 @@
 #include <ctype.h>
 #include <assert.h>
 
-#include "substext.h"
+#include "../substext.h"
 #include "ttml.h"
 #include "imageupdater.h"
 #include "ttmlpes.h"


=====================================
modules/demux/adaptive/http/HTTPConnection.cpp
=====================================
@@ -32,10 +32,10 @@
 
 extern "C"
 {
-    #include "../access/http/resource.h"
-    #include "../access/http/connmgr.h"
-    #include "../access/http/conn.h"
-    #include "../access/http/message.h"
+    #include "access/http/resource.h"
+    #include "access/http/connmgr.h"
+    #include "access/http/conn.h"
+    #include "access/http/message.h"
 }
 
 using namespace adaptive::http;


=====================================
modules/demux/adaptive/http/HTTPConnectionManager.cpp
=====================================
@@ -29,7 +29,7 @@
 #include "HTTPConnection.hpp"
 #include "ConnectionParams.hpp"
 #include "Downloader.hpp"
-#include "tools/Debug.hpp"
+#include "../tools/Debug.hpp"
 #include <vlc_url.h>
 #include <vlc_http.h>
 


=====================================
modules/demux/dash/DASHManager.cpp
=====================================
@@ -31,8 +31,8 @@
 #include "DASHManager.h"
 #include "mpd/ProgramInformation.h"
 #include "mpd/IsoffMainParser.h"
-#include "xml/DOMParser.h"
-#include "xml/Node.h"
+#include "../adaptive/xml/DOMParser.h"
+#include "../adaptive/xml/Node.h"
 #include "../adaptive/SharedResources.hpp"
 #include "../adaptive/tools/Helper.h"
 #include "../adaptive/http/HTTPConnectionManager.h"


=====================================
modules/video_output/apple/VLCCVOpenGLProvider.m
=====================================
@@ -47,8 +47,8 @@
 #import <vlc_opengl.h>
 #import <vlc_picture_pool.h>
 
-#import "../codec/vt_utils.h"
-#import "../video_output/opengl/vout_helper.h"
+#import "codec/vt_utils.h"
+#import "video_output/opengl/vout_helper.h"
 
 #define BUFFER_COUNT 3
 



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/e41e3ea06090641093c05f03b66d0279c947f8cd

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/e41e3ea06090641093c05f03b66d0279c947f8cd
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance