v4l2: add per-codec bytes per pixel in codec table (refs #8802)

[vlc] / modules / stream_out / Modules.am

diff --git a/modules/stream_out/Modules.am b/modules/stream_out/Modules.am
index 71e7d797b158340001239c19e2acbb10e92957bc..187b799f5659796977ffc19715bc3884376d81b6 100644 (file)
--- a/modules/stream_out/Modules.am
+++ b/modules/stream_out/Modules.am
@@ -1,5 +1,3 @@
-SUBDIRS = transcode
-
 SOURCES_stream_out_dummy = dummy.c
 SOURCES_stream_out_delay = delay.c
 SOURCES_stream_out_description = description.c
@@ -8,16 +6,20 @@ SOURCES_stream_out_duplicate = duplicate.c
 SOURCES_stream_out_es = es.c
 SOURCES_stream_out_display = display.c
 SOURCES_stream_out_gather = gather.c
-SOURCES_stream_out_switcher = switcher.c
 SOURCES_stream_out_bridge = bridge.c
 SOURCES_stream_out_mosaic_bridge = mosaic_bridge.c
 SOURCES_stream_out_autodel = autodel.c
 SOURCES_stream_out_record = record.c
-SOURCES_stream_out_raop = raop.c
 SOURCES_stream_out_smem = smem.c
 SOURCES_stream_out_setid = setid.c
 SOURCES_stream_out_langfromtelx = langfromtelx.c
-SOURCES_stream_out_select = select.c
+SOURCES_stream_out_chromaprint = chromaprint.c chromaprint_data.h dummy.cpp
+
+libstream_out_transcode_plugin_la_SOURCES = \
+       transcode/transcode.c transcode/transcode.h \
+       transcode/osd.c transcode/spu.c transcode/audio.c transcode/video.c
+libstream_out_transcode_plugin_la_CFLAGS = $(AM_CFLAGS)
+libstream_out_transcode_plugin_la_LIBADD = $(AM_LIBADD)
 
 libvlc_LTLIBRARIES += \
        libstream_out_dummy_plugin.la \
@@ -35,8 +37,7 @@ libvlc_LTLIBRARIES += \
        libstream_out_smem_plugin.la \
        libstream_out_setid_plugin.la \
        libstream_out_langfromtelx_plugin.la \
-       libstream_out_select_plugin.la \
-       $(NULL)
+       libstream_out_transcode_plugin.la
 
 # RTP plugin
 libvlc_LTLIBRARIES += \
@@ -44,12 +45,24 @@ libvlc_LTLIBRARIES += \
 libstream_out_rtp_plugin_la_SOURCES = \
        rtp.c rtp.h rtpfmt.c rtcp.c rtsp.c vod.c
 libstream_out_rtp_plugin_la_CFLAGS = $(AM_CFLAGS)
-libstream_out_rtp_plugin_la_LIBADD = $(AM_LIBADD)
-libstream_out_rtp_plugin_la_DEPENDENCIES =
+libstream_out_rtp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
 if HAVE_GCRYPT
-SRTP_CFLAGS = -I$(top_srcdir)/libs/srtp
-SRTP_LIBS = $(top_builddir)/libs/srtp/libvlc_srtp.la
-libstream_out_rtp_plugin_la_CFLAGS += -DHAVE_SRTP $(SRTP_CFLAGS)
-libstream_out_rtp_plugin_la_LIBADD += $(SRTP_LIBS)
-libstream_out_rtp_plugin_la_DEPENDENCIES += $(SRTP_LIBS)
+SRTP_CFLAGS = -I$(top_srcdir)/modules/access/rtp
+SRTP_LIBS = $(top_builddir)/modules/access/rtp/libvlc_srtp.la
+libstream_out_rtp_plugin_la_CFLAGS += -DHAVE_SRTP $(SRTP_CFLAGS) \
+       $(GCRYPT_CFLAGS)
+libstream_out_rtp_plugin_la_LIBADD += $(SRTP_LIBS) $(GCRYPT_LIBS)
 endif
+
+# RAOP plugin
+libstream_out_raop_plugin_la_SOURCES = raop.c
+libstream_out_raop_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
+libstream_out_raop_plugin_la_LIBADD = $(AM_LIBADD) $(GCRYPT_LIBS) -lgpg-error $(LIBS_stream_out_raop)
+if HAVE_GCRYPT
+libvlc_LTLIBRARIES += libstream_out_raop_plugin.la
+endif
+
+BUILT_SOURCES += dummy.cpp
+
+dummy.cpp:
+       touch dummy.cpp