Commit b8931973 authored by Wim Taymans's avatar Wim Taymans

media: port to 1.0

parent f94572fb
......@@ -326,6 +326,7 @@ AG_GST_CHECK_PLUGIN(isomp4)
AG_GST_CHECK_PLUGIN(law)
AG_GST_CHECK_PLUGIN(level)
AG_GST_CHECK_PLUGIN(matroska)
AG_GST_CHECK_PLUGIN(median)
AG_GST_CHECK_PLUGIN(monoscope)
AG_GST_CHECK_PLUGIN(multifile)
AG_GST_CHECK_PLUGIN(multipart)
......@@ -1082,6 +1083,7 @@ gst/isomp4/Makefile
gst/law/Makefile
gst/level/Makefile
gst/matroska/Makefile
gst/median/Makefile
gst/monoscope/Makefile
gst/multifile/Makefile
gst/multipart/Makefile
......
plugin_LTLIBRARIES = libgstmedian.la
libgstmedian_la_SOURCES = gstmedian.c
libgstmedian_la_CFLAGS = $(GST_CFLAGS)
libgstmedian_la_LIBADD = $(GST_LIBS)
libgstmedian_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) $(GST_CFLAGS)
libgstmedian_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
libgstmedian_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libgstmedian_la_LIBTOOLFLAGS = --tag=disable-static
noinst_HEADERS = gstmedian.h
Android.mk: Makefile.am $(BUILT_SOURCES)
androgenizer \
-:PROJECT libgstmedian -:SHARED libgstmedian \
-:TAGS eng debug \
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-:SOURCES $(libgstmedian_la_SOURCES) \
-:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstmedian_la_CFLAGS) \
-:LDFLAGS $(libgstmedian_la_LDFLAGS) \
$(libgstmedian_la_LIBADD) \
-ldl \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \
LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-1.0' \
> $@
This diff is collapsed.
......@@ -23,12 +23,10 @@
#include <gst/gst.h>
#include <gst/video/video.h>
#include <gst/video/gstvideofilter.h>
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
G_BEGIN_DECLS
#define GST_TYPE_MEDIAN \
(gst_median_get_type())
......@@ -45,7 +43,7 @@ typedef struct _GstMedian GstMedian;
typedef struct _GstMedianClass GstMedianClass;
struct _GstMedian {
GstElement element;
GstVideoFilter parent;
int format;
int width;
......@@ -60,12 +58,11 @@ struct _GstMedian {
};
struct _GstMedianClass {
GstElementClass parent_class;
GstVideoFilterClass parent_class;
};
#ifdef __cplusplus
}
#endif /* __cplusplus */
GType gst_median_get_type (void);
G_END_DECLS
#endif /* __GST_MEDIAN_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment