From 8968628ca263b3260d310f4b28e60a711703d4e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 8 Sep 2012 14:43:37 +0100 Subject: [PATCH] hls: disable hlssink but do build hlsdemux --- gst/hls/Makefile.am | 15 +++++++++------ gst/hls/gstfragmentedplugin.c | 4 ++++ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gst/hls/Makefile.am b/gst/hls/Makefile.am index d0c32b7029..e51611746c 100644 --- a/gst/hls/Makefile.am +++ b/gst/hls/Makefile.am @@ -1,29 +1,32 @@ plugin_LTLIBRARIES = libgstfragmented.la +# FIXME: hlssink +# gsthlssink.c +# gstm3u8playlist.c libgstfragmented_la_SOURCES = \ m3u8.c \ gsthlsdemux.c \ gstfragment.c \ gsturidownloader.c \ - gstm3u8playlist.c \ - gsthlssink.c \ gstfragmentedplugin.c libgstfragmented_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SOUP_CFLAGS) $(GIO_CFLAGS) -libgstfragmented_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(SOUP_LIBS) $(GIO_LIBS) -lgstpbutils-$(GST_MAJORMINOR) -lgstvideo-$(GST_MAJORMINOR) +# $(GST_PLUGINS_BAD_CFLAGS) -lgstpbutils-$(GST_MAJORMINOR) -lgstvideo-$(GST_MAJORMINOR) +libgstfragmented_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(SOUP_LIBS) $(GIO_LIBS) libgstfragmented_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -no-undefined libgstfragmented_la_LIBTOOLFLAGS = --tag=disable-static # headers we need but don't want installed +# +# gstm3u8playlist.h +# gsthlssink.h noinst_HEADERS = \ gstfragmented.h \ gstfragment.h \ gsthlsdemux.h \ gsturidownloader.h \ - m3u8.h \ - gstm3u8playlist.h \ - gsthlssink.h + m3u8.h Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ diff --git a/gst/hls/gstfragmentedplugin.c b/gst/hls/gstfragmentedplugin.c index 89a77412ad..f5650293a9 100644 --- a/gst/hls/gstfragmentedplugin.c +++ b/gst/hls/gstfragmentedplugin.c @@ -6,7 +6,9 @@ #include "gstfragmented.h" #include "gsthlsdemux.h" +#if 0 #include "gsthlssink.h" +#endif GST_DEBUG_CATEGORY (fragmented_debug); @@ -19,8 +21,10 @@ fragmented_init (GstPlugin * plugin) GST_TYPE_HLS_DEMUX) || FALSE) return FALSE; +#if 0 if (!gst_hls_sink_plugin_init (plugin)) return FALSE; +#endif return TRUE; }