mkv: avoid potential NULL memory comparison

[vlc] / modules / demux / Makefile.am

diff --git a/modules/demux/Makefile.am b/modules/demux/Makefile.am
index 75f5b528a097bf7adc073b3be1ba7cc03574b5ae..64f988474dcefa6183287d9befab41c41d8ab2d7 100644 (file)
--- a/modules/demux/Makefile.am
+++ b/modules/demux/Makefile.am
@@ -57,6 +57,7 @@ libmjpeg_plugin_la_SOURCES = demux/mjpeg.c demux/mxpeg_helper.h
 demux_LTLIBRARIES += libmjpeg_plugin.la
 
 libsubtitle_plugin_la_SOURCES = demux/subtitle.c
+libsubtitle_plugin_la_LIBADD = $(LIBM)
 demux_LTLIBRARIES += libsubtitle_plugin.la
 
 libty_plugin_la_SOURCES = demux/ty.c codec/cc.h
@@ -216,12 +217,17 @@ libplaylist_plugin_la_SOURCES = \
        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
 libts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS)
 libts_plugin_la_LIBADD = $(DVBPSI_LIBS) $(SOCKET_LIBS)
+if HAVE_ARIBB24
+libts_plugin_la_CFLAGS += $(ARIBB24_CFLAGS)
+libts_plugin_la_LIBADD += $(ARIBB24_LIBS)
+endif
 if HAVE_DVBPSI
 demux_LTLIBRARIES += libts_plugin.la
 endif