diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2015-08-30 15:55:51 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2015-09-30 00:43:26 +0100 |
| commit | 019cdea1bd62011887ebce82edfd3148b66fc475 (patch) | |
| tree | f5ba1daf810fc882b52be733f4f470da7c86884c /ext | |
| parent | 5bf7432f81a095f55f89aa65b4f9f27335e2b747 (diff) | |
| download | gstreamer-plugins-bad-019cdea1bd62011887ebce82edfd3148b66fc475.tar.gz | |
hls: remove unused macro and direct gio usage
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/hls/Makefile.am | 4 | ||||
| -rw-r--r-- | ext/hls/gstfragmented.h | 2 | ||||
| -rw-r--r-- | ext/hls/gsthlssink.c | 1 | ||||
| -rw-r--r-- | ext/hls/gstm3u8playlist.h | 1 |
4 files changed, 2 insertions, 6 deletions
diff --git a/ext/hls/Makefile.am b/ext/hls/Makefile.am index f66880fe8..2c287c70e 100644 --- a/ext/hls/Makefile.am +++ b/ext/hls/Makefile.am @@ -8,12 +8,12 @@ libgstfragmented_la_SOURCES = \ gsthlssink.c \ gstm3u8playlist.c -libgstfragmented_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS) $(LIBGCRYPT_CFLAGS) $(NETTLE_CFLAGS) +libgstfragmented_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBGCRYPT_CFLAGS) $(NETTLE_CFLAGS) libgstfragmented_la_LIBADD = \ $(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-@GST_API_VERSION@.la \ $(top_builddir)/gst-libs/gst/adaptivedemux/libgstadaptivedemux-@GST_API_VERSION@.la \ $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \ - $(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS) $(LIBM) $(LIBGCRYPT_LIBS) $(NETTLE_LIBS) $(OPENSSL_LIBS) + $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) $(LIBGCRYPT_LIBS) $(NETTLE_LIBS) $(OPENSSL_LIBS) libgstfragmented_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -no-undefined libgstfragmented_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) diff --git a/ext/hls/gstfragmented.h b/ext/hls/gstfragmented.h index c1c7a2b0f..46656aca3 100644 --- a/ext/hls/gstfragmented.h +++ b/ext/hls/gstfragmented.h @@ -7,8 +7,6 @@ G_BEGIN_DECLS GST_DEBUG_CATEGORY_EXTERN (fragmented_debug); -#define LOG_CAPS(obj, caps) GST_DEBUG_OBJECT (obj, "%s: %" GST_PTR_FORMAT, #caps, caps) - G_END_DECLS #endif /* __GST_FRAGMENTED_H__ */ diff --git a/ext/hls/gsthlssink.c b/ext/hls/gsthlssink.c index de5e84cef..03671d009 100644 --- a/ext/hls/gsthlssink.c +++ b/ext/hls/gsthlssink.c @@ -36,7 +36,6 @@ #include "gsthlssink.h" #include <gst/pbutils/pbutils.h> #include <gst/video/video.h> -#include <gio/gio.h> #include <glib/gstdio.h> #include <memory.h> diff --git a/ext/hls/gstm3u8playlist.h b/ext/hls/gstm3u8playlist.h index 0e9513248..f9723229a 100644 --- a/ext/hls/gstm3u8playlist.h +++ b/ext/hls/gstm3u8playlist.h @@ -23,7 +23,6 @@ #define __GST_M3U8_PLAYLIST_H__ #include <glib.h> -#include <gio/gio.h> G_BEGIN_DECLS |