Imported Upstream version 1.5.0.1+git20150513
diff --git a/gst/realmedia/Makefile.am b/gst/realmedia/Makefile.am
index 46cbbc3..d307a72 100644
--- a/gst/realmedia/Makefile.am
+++ b/gst/realmedia/Makefile.am
@@ -23,17 +23,3 @@
noinst_PROGRAMS = asmrules
asmrules_CFLAGS = $(GST_CFLAGS) -DTEST
asmrules_LDADD = $(GST_LIBS) $(LIBM)
-
-Android.mk: Makefile.am $(BUILT_SOURCES)
- androgenizer \
- -:PROJECT libgstrmdemux -:SHARED libgstrmdemux \
- -:TAGS eng debug \
- -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
- -:SOURCES $(libgstrmdemux_la_SOURCES) \
- -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrmdemux_la_CFLAGS) \
- -:LDFLAGS $(libgstrmdemux_la_LDFLAGS) \
- $(libgstrmdemux_la_LIBADD) \
- -ldl \
- -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
- LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
- > $@
diff --git a/gst/realmedia/Makefile.in b/gst/realmedia/Makefile.in
index 5909e4a..ad2f6b3 100644
--- a/gst/realmedia/Makefile.in
+++ b/gst/realmedia/Makefile.in
@@ -967,20 +967,6 @@
uninstall-am uninstall-pluginLTLIBRARIES
-Android.mk: Makefile.am $(BUILT_SOURCES)
- androgenizer \
- -:PROJECT libgstrmdemux -:SHARED libgstrmdemux \
- -:TAGS eng debug \
- -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
- -:SOURCES $(libgstrmdemux_la_SOURCES) \
- -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrmdemux_la_CFLAGS) \
- -:LDFLAGS $(libgstrmdemux_la_LDFLAGS) \
- $(libgstrmdemux_la_LIBADD) \
- -ldl \
- -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
- LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \
- > $@
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/gst/realmedia/pnmsrc.c b/gst/realmedia/pnmsrc.c
index 241036c..4db082f 100644
--- a/gst/realmedia/pnmsrc.c
+++ b/gst/realmedia/pnmsrc.c
@@ -40,8 +40,7 @@
enum
{
PROP_0,
- PROP_LOCATION,
- PROP_LAST
+ PROP_LOCATION
};
static GstStaticPadTemplate gst_pnm_src_template =
diff --git a/gst/realmedia/rademux.c b/gst/realmedia/rademux.c
index 130f7a8..5aa92ac 100644
--- a/gst/realmedia/rademux.c
+++ b/gst/realmedia/rademux.c
@@ -25,13 +25,13 @@
* <refsect2>
* <title>Example launch line</title>
* |[
- * gst-launch filesrc location=interview.ra ! rademux ! ffdec_real_288 ! audioconvert ! audioresample ! alsasink
+ * gst-launch-1.0 filesrc location=interview.ra ! rademux ! avdec_real_288 ! audioconvert ! audioresample ! autoaudiosink
* ]| Read a RealAudio file and decode it and output it to the soundcard using
* the ALSA element. The .ra file is assumed to contain RealAudio version 2.
* |[
- * gst-launch gnomevfssrc location=http://www.example.org/interview.ra ! rademux ! a52dec ! audioconvert ! audioresample ! alsasink
+ * gst-launch-1.0 souphttpsrc location=http://www.example.org/interview.ra ! rademux ! ac3parse ! a52dec ! audioconvert ! audioresample ! autoaudiosink
* ]| Stream RealAudio data containing AC3 (dnet) compressed audio and decode it
- * and output it to the soundcard using the ALSA element.
+ * and output it to the soundcard.
* </refsect2>
*/
diff --git a/gst/realmedia/rdtdepay.c b/gst/realmedia/rdtdepay.c
index 308faec..ac79b74 100644
--- a/gst/realmedia/rdtdepay.c
+++ b/gst/realmedia/rdtdepay.c
@@ -39,7 +39,7 @@
enum
{
- ARG_0,
+ PROP_0,
};
static GstStaticPadTemplate gst_rdt_depay_src_template =
diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c
index d4afae4..d5d3ac1 100644
--- a/gst/realmedia/rmdemux.c
+++ b/gst/realmedia/rmdemux.c
@@ -2562,7 +2562,8 @@
ret = GST_FLOW_OK;
}
- cret = gst_flow_combiner_update_flow (rmdemux->flowcombiner, ret);
+ cret = gst_flow_combiner_update_pad_flow (rmdemux->flowcombiner, stream->pad,
+ ret);
beach:
return cret;
