demux: move mpeg demuxers to mpeg/

modules/access/dvdnav.c

@@ -60,7 +60,7 @@
 
 #include <dvdnav/dvdnav.h>
 
-#include "../demux/ps.h"
+#include "../demux/mpeg/ps.h"
 
 /*****************************************************************************
  * Module descriptor

modules/access/dvdread.c

@@ -48,7 +48,7 @@
 
 #include <vlc_iso_lang.h>
 
-#include "../demux/ps.h"
+#include "../demux/mpeg/ps.h"
 
 #include <sys/types.h>
 #include <unistd.h>

modules/demux/Makefile.am

@@ -37,7 +37,7 @@ demux_LTLIBRARIES += libnsv_plugin.la
 libreal_plugin_la_SOURCES = demux/real.c
 demux_LTLIBRARIES += libreal_plugin.la
 
-libps_plugin_la_SOURCES = demux/ps.c demux/ps.h
+libps_plugin_la_SOURCES = demux/mpeg/ps.c demux/mpeg/ps.h
 demux_LTLIBRARIES += libps_plugin.la
 
 libmod_plugin_la_SOURCES = demux/mod.c
@@ -226,12 +226,12 @@ libplaylist_plugin_la_SOURCES = \
 	demux/playlist/playlist.c demux/playlist/playlist.h
 demux_LTLIBRARIES += libplaylist_plugin.la
 
-libts_plugin_la_SOURCES = demux/ts.c \
-        demux/mpeg4_iod.c demux/mpeg4_iod.h \
+libts_plugin_la_SOURCES = demux/mpeg/ts.c \
+        demux/mpeg/mpeg4_iod.c demux/mpeg/mpeg4_iod.h \
 	mux/mpeg/csa.c mux/mpeg/dvbpsi_compat.h \
 	mux/mpeg/streams.h mux/mpeg/tables.c mux/mpeg/tables.h \
 	mux/mpeg/tsutil.c mux/mpeg/tsutil.h \
-	demux/dvb-text.h codec/opus_header.c demux/opus.h
+	demux/mpeg/dvb-text.h codec/opus_header.c demux/opus.h
 libts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS)
 libts_plugin_la_LIBADD = $(DVBPSI_LIBS) $(SOCKET_LIBS)
 if HAVE_ARIBB24

modules/demux/ts.c → modules/demux/mpeg/ts.c

@@ -43,7 +43,7 @@
 #include <vlc_charset.h>   /* FromCharset, for EIT */
 #include <vlc_bits.h>
 
-#include "../mux/mpeg/csa.h"
+#include "../../mux/mpeg/csa.h"
 
 /* Include dvbpsi headers */
 # include <dvbpsi/dvbpsi.h>
@@ -61,14 +61,14 @@
 /* TDT support */
 # include <dvbpsi/tot.h>
 
-#include "../mux/mpeg/dvbpsi_compat.h"
-#include "../mux/mpeg/streams.h"
-#include "../mux/mpeg/tsutil.h"
-#include "../mux/mpeg/tables.h"
+#include "../../mux/mpeg/dvbpsi_compat.h"
+#include "../../mux/mpeg/streams.h"
+#include "../../mux/mpeg/tsutil.h"
+#include "../../mux/mpeg/tables.h"
 
-#include "../codec/opus_header.h"
+#include "../../codec/opus_header.h"
 
-#include "opus.h"
+#include "../opus.h"
 
 #include "mpeg4_iod.h"
 
@@ -3536,7 +3536,7 @@ static void ValidateDVBMeta( demux_t *p_demux, int i_pid )
     p_sys->b_dvb_meta = false;
 }
 
-#include "dvb-text.h"
+#include "../dvb-text.h"
 
 static char *EITConvertToUTF8( demux_t *p_demux,
                                const unsigned char *psz_instring,

modules/demux/vobsub.c

@@ -36,7 +36,7 @@
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 
-#include "ps.h"
+#include "mpeg/ps.h"
 #include "vobsub.h"
 
 /*****************************************************************************

po/POTFILES.in

@@ -491,6 +491,9 @@ modules/demux/mpeg/es.c
 modules/demux/mpeg/h264.c
 modules/demux/mpeg/hevc.c
 modules/demux/mpeg/mpgv.c
+modules/demux/mpeg/ps.c
+modules/demux/mpeg/ps.h
+modules/demux/mpeg/ts.c
 modules/demux/nsc.c
 modules/demux/nsv.c
 modules/demux/nuv.c
@@ -511,8 +514,6 @@ modules/demux/playlist/qtl.c
 modules/demux/playlist/sgimb.c
 modules/demux/playlist/shoutcast.c
 modules/demux/playlist/xspf.c
-modules/demux/ps.c
-modules/demux/ps.h
 modules/demux/pva.c
 modules/demux/rawaud.c
 modules/demux/rawdv.c
@@ -522,7 +523,6 @@ modules/demux/sid.cpp
 modules/demux/smf.c
 modules/demux/stl.c
 modules/demux/subtitle.c
-modules/demux/ts.c
 modules/demux/tta.c
 modules/demux/ty.c
 modules/demux/vc1.c