[vlc-commits] include vlc_input_item.h instead of vlc_input.h

Thomas Guillem git at videolan.org
Mon Jun 3 16:16:22 CEST 2019


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Fri May 31 12:22:58 2019 +0200| [57d834cd27fe71e97bc6c770482c57d0f8d40192] | committer: Thomas Guillem

include vlc_input_item.h instead of vlc_input.h

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

 modules/access/cdda.c        | 2 +-
 modules/access/http.c        | 2 +-
 modules/codec/faad.c         | 2 +-
 modules/codec/kate.c         | 2 +-
 modules/codec/speex.c        | 2 +-
 modules/codec/theora.c       | 2 +-
 modules/codec/vorbis.c       | 2 +-
 modules/control/win_msg.c    | 1 +
 modules/demux/directory.c    | 2 +-
 modules/demux/ty.c           | 2 +-
 modules/misc/playlist/html.c | 2 +-
 modules/misc/playlist/m3u.c  | 2 +-
 modules/misc/playlist/xspf.c | 2 +-
 modules/misc/rtsp.c          | 2 +-
 modules/stream_out/vod.c     | 2 +-
 15 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index 7fc7af6590..37675a06fb 100644
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -44,7 +44,7 @@
 #include <vlc_common.h>
 #include <vlc_demux.h>
 #include <vlc_plugin.h>
-#include <vlc_input.h>
+#include <vlc_input_item.h>
 #include <vlc_access.h>
 #include <vlc_meta.h>
 #include <vlc_charset.h> /* ToLocaleDup */
diff --git a/modules/access/http.c b/modules/access/http.c
index 56d75687e2..a1d0593e0f 100644
--- a/modules/access/http.c
+++ b/modules/access/http.c
@@ -43,7 +43,7 @@
 #include <vlc_url.h>
 #include <vlc_strings.h>
 #include <vlc_charset.h>
-#include <vlc_input.h>
+#include <vlc_input_item.h>
 #include <vlc_http.h>
 #include <vlc_interrupt.h>
 #include <vlc_keystore.h>
diff --git a/modules/codec/faad.c b/modules/codec/faad.c
index 55dfa38e41..0bb2b52dda 100644
--- a/modules/codec/faad.c
+++ b/modules/codec/faad.c
@@ -35,7 +35,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_input.h>
+#include <vlc_input_item.h>
 #include <vlc_codec.h>
 #include <vlc_cpu.h>
 #include <vlc_aout.h>
diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index 81eeec9425..65c810295c 100644
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -29,7 +29,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_input.h>
+#include <vlc_input_item.h>
 #include <vlc_codec.h>
 #include "../demux/xiph.h"
 
diff --git a/modules/codec/speex.c b/modules/codec/speex.c
index 678244b230..5f7c093245 100644
--- a/modules/codec/speex.c
+++ b/modules/codec/speex.c
@@ -29,7 +29,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_input.h>
+#include <vlc_input_item.h>
 #include <vlc_codec.h>
 #include "../demux/xiph.h"
 
diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index 5ed08a9b84..a4874f1f47 100644
--- a/modules/codec/theora.c
+++ b/modules/codec/theora.c
@@ -31,7 +31,7 @@
 #include <vlc_plugin.h>
 #include <vlc_codec.h>
 #include <vlc_sout.h>
-#include <vlc_input.h>
+#include <vlc_input_item.h>
 #include "../demux/xiph.h"
 
 #include <ogg/ogg.h>
diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index a3bebd6a8d..a571e54c8f 100644
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -35,7 +35,7 @@
 #include <vlc_codec.h>
 #include <vlc_charset.h>
 #include <vlc_aout.h>
-#include <vlc_input.h>
+#include <vlc_input_item.h>
 #include <vlc_sout.h>
 #include "../demux/xiph.h"
 
diff --git a/modules/control/win_msg.c b/modules/control/win_msg.c
index bf56f266f3..0e7ae1ba70 100644
--- a/modules/control/win_msg.c
+++ b/modules/control/win_msg.c
@@ -31,6 +31,7 @@
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 #include <vlc_url.h> // FIXME: move URL generation to calling process
+#include <vlc_input_item.h>
 
 #include <windows.h>
 
diff --git a/modules/demux/directory.c b/modules/demux/directory.c
index c2121a5aab..874760ea08 100644
--- a/modules/demux/directory.c
+++ b/modules/demux/directory.c
@@ -26,7 +26,7 @@
 
 #include <vlc_common.h>
 #include <vlc_demux.h>
-#include <vlc_input.h>
+#include <vlc_input_item.h>
 #include <vlc_plugin.h>
 
 static int Demux( demux_t *p_demux )
diff --git a/modules/demux/ty.c b/modules/demux/ty.c
index 7dc0439336..4c02aff65e 100644
--- a/modules/demux/ty.c
+++ b/modules/demux/ty.c
@@ -43,7 +43,7 @@
 #include <vlc_demux.h>
 #include <vlc_codec.h>
 #include <vlc_meta.h>
-#include <vlc_input.h>
+#include <vlc_input_item.h>
 #include "../codec/cc.h"
 
 #include "mpeg/pes.h"
diff --git a/modules/misc/playlist/html.c b/modules/misc/playlist/html.c
index 9c9773f66a..ad731a5af9 100644
--- a/modules/misc/playlist/html.c
+++ b/modules/misc/playlist/html.c
@@ -25,7 +25,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_input.h>
+#include <vlc_input_item.h>
 #include <vlc_playlist_export.h>
 #include <vlc_strings.h>
 
diff --git a/modules/misc/playlist/m3u.c b/modules/misc/playlist/m3u.c
index 4f232a5167..8d3bfc5446 100644
--- a/modules/misc/playlist/m3u.c
+++ b/modules/misc/playlist/m3u.c
@@ -29,7 +29,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_input.h>
+#include <vlc_input_item.h>
 #include <vlc_meta.h>
 #include <vlc_charset.h>
 #include <vlc_playlist_export.h>
diff --git a/modules/misc/playlist/xspf.c b/modules/misc/playlist/xspf.c
index f61c45a2b0..d03b22fa07 100644
--- a/modules/misc/playlist/xspf.c
+++ b/modules/misc/playlist/xspf.c
@@ -30,7 +30,7 @@
 #endif
 
 #include <vlc_common.h>
-#include <vlc_input.h>
+#include <vlc_input_item.h>
 #include <vlc_playlist_export.h>
 #include <vlc_strings.h>
 #include <vlc_url.h>
diff --git a/modules/misc/rtsp.c b/modules/misc/rtsp.c
index e486c2d854..d90f754357 100644
--- a/modules/misc/rtsp.c
+++ b/modules/misc/rtsp.c
@@ -32,7 +32,7 @@
 #define VLC_MODULE_LICENSE VLC_LICENSE_GPL_2_PLUS
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_input.h>
+#include <vlc_input_item.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
 
diff --git a/modules/stream_out/vod.c b/modules/stream_out/vod.c
index 042894c84f..75bfacdeb4 100644
--- a/modules/stream_out/vod.c
+++ b/modules/stream_out/vod.c
@@ -32,7 +32,7 @@
 
 #include <vlc_common.h>
 #include <vlc_plugin.h>
-#include <vlc_input.h>
+#include <vlc_input_item.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
 



More information about the vlc-commits mailing list