demux: ts: rewrite/split IOD parsing

[vlc] / modules / demux / Makefile.am

diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index 2533305874f34feb25942e3ca5ce3d6b37ed4a2f..cd8a5bdef1ce3939617ff7755c8d842fce3a4b96 100644 (file)
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -7,9 +7,9 @@ demux_LTLIBRARIES += libflacsys_plugin.la
 
 libogg_plugin_la_SOURCES = demux/ogg.c demux/ogg.h demux/oggseek.c demux/oggseek.h \
        demux/xiph_metadata.h demux/xiph.h demux/xiph_metadata.c demux/opus.h
-libogg_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_ogg) $(LIBVORBIS_CFLAGS)
+libogg_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBVORBIS_CFLAGS) $(OGG_CFLAGS)
 libogg_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
-libogg_plugin_la_LIBADD = $(LIBS_ogg) $(LIBVORBIS_LIBS)
+libogg_plugin_la_LIBADD = $(LIBVORBIS_LIBS) $(OGG_LIBS)
 EXTRA_LTLIBRARIES += libogg_plugin.la
 demux_LTLIBRARIES += $(LTLIBogg)
 
@@ -80,7 +80,7 @@ demux_LTLIBRARIES += libnsc_plugin.la
 
 libmpc_plugin_la_SOURCES = demux/mpc.c
 libmpc_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
-libmpc_plugin_la_LIBADD = $(LIBS_mpc)
+libmpc_plugin_la_LIBADD = $(LIBS_mpc) $(LIBM)
 EXTRA_LTLIBRARIES += libmpc_plugin.la
 demux_LTLIBRARIES += $(LTLIBmpc)
 
@@ -180,6 +180,7 @@ libmkv_plugin_la_SOURCES = \
        demux/mp4/libmp4.c demux/vobsub.h \
        demux/mkv/mkv.hpp demux/mkv/mkv.cpp \
        demux/windows_audio_commons.h
+libmkv_plugin_la_SOURCES += codec/dts_header.h codec/dts_header.c
 libmkv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libmkv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
 libmkv_plugin_la_LIBADD = $(LIBS_mkv)
@@ -221,12 +222,16 @@ libplaylist_plugin_la_SOURCES = \
        demux/playlist/shoutcast.c \
        demux/playlist/wpl.c \
        demux/playlist/xspf.c \
-       demux/playlist/zpl.c \
        demux/playlist/directory.c \
        demux/playlist/playlist.c demux/playlist/playlist.h
 demux_LTLIBRARIES += libplaylist_plugin.la
 
-libts_plugin_la_SOURCES = demux/ts.c mux/mpeg/csa.c mux/mpeg/dvbpsi_compat.h demux/dvb-text.h codec/opus_header.c demux/opus.h
+libts_plugin_la_SOURCES = demux/ts.c \
+        demux/mpeg4_iod.c demux/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
 libts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS)
 libts_plugin_la_LIBADD = $(DVBPSI_LIBS) $(SOCKET_LIBS)
 if HAVE_ARIBB24
@@ -289,12 +294,8 @@ libdash_plugin_la_SOURCES = \
     demux/dash/mpd/Segment.h \
     demux/dash/mpd/SegmentBase.cpp \
     demux/dash/mpd/SegmentBase.h \
-    demux/dash/mpd/SegmentInfo.cpp \
-    demux/dash/mpd/SegmentInfo.h \
     demux/dash/mpd/SegmentInfoCommon.cpp \
     demux/dash/mpd/SegmentInfoCommon.h \
-    demux/dash/mpd/SegmentInfoDefault.cpp \
-    demux/dash/mpd/SegmentInfoDefault.h \
     demux/dash/mpd/SegmentInformation.cpp \
     demux/dash/mpd/SegmentInformation.hpp \
     demux/dash/mpd/SegmentList.cpp \