diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-05-20 12:07:45 +0200 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2011-05-20 12:07:45 +0200 |
| commit | a9edf7c6aad8a25ce5eeac832a22e67a888f85e0 (patch) | |
| tree | 1bf82791084af0187c5eb6713a76ce99b37ae65d | |
| parent | 67cd7fd0a21be58b924b8d05d182d8cab2ea4948 (diff) | |
| parent | aa2bfc9b7fc1a1b7264624f749158fad986d18b5 (diff) | |
Merge branch 'master' into 0.11
Conflicts:
docs/plugins/gstreamer-plugins.hierarchy
| m--------- | common | 0 | ||||
| -rw-r--r-- | docs/plugins/gstreamer-plugins.args | 2 | ||||
| -rw-r--r-- | docs/plugins/gstreamer-plugins.interfaces | 6 | ||||
| -rw-r--r-- | gst/gstpreset.c | 2 | ||||
| -rw-r--r-- | gst/gstpreset.h | 1 |
5 files changed, 6 insertions, 5 deletions
diff --git a/common b/common -Subproject 9e5bbd508588961696e70c38e764492e0312ec4 +Subproject 69b981f10caa234ad0ff639179d0fda8505bd94 diff --git a/docs/plugins/gstreamer-plugins.args b/docs/plugins/gstreamer-plugins.args index 5d965e6ae..119828051 100644 --- a/docs/plugins/gstreamer-plugins.args +++ b/docs/plugins/gstreamer-plugins.args @@ -271,7 +271,7 @@ <ARG> <NAME>GstFakeSink::num-buffers</NAME> <TYPE>gint</TYPE> -<RANGE>>= G_MAXULONG</RANGE> +<RANGE>>= -1</RANGE> <FLAGS>rw</FLAGS> <NICK>num-buffers</NICK> <BLURB>Number of buffers to accept going EOS.</BLURB> diff --git a/docs/plugins/gstreamer-plugins.interfaces b/docs/plugins/gstreamer-plugins.interfaces index 024530368..03805f5be 100644 --- a/docs/plugins/gstreamer-plugins.interfaces +++ b/docs/plugins/gstreamer-plugins.interfaces @@ -1,6 +1,6 @@ GstBin GstChildProxy -GstPipeline GstChildProxy -GstFdSrc GstURIHandler -GstFileSrc GstURIHandler GstFdSink GstURIHandler +GstFdSrc GstURIHandler GstFileSink GstURIHandler +GstFileSrc GstURIHandler +GstPipeline GstChildProxy diff --git a/gst/gstpreset.c b/gst/gstpreset.c index 99a5755f4..b958baac5 100644 --- a/gst/gstpreset.c +++ b/gst/gstpreset.c @@ -86,6 +86,8 @@ #include "gst_private.h" #include "gstpreset.h" +#include "gstinfo.h" +#include "gstvalue.h" #ifdef HAVE_UNISTD_H #include <unistd.h> diff --git a/gst/gstpreset.h b/gst/gstpreset.h index 73816326b..ccf1366f6 100644 --- a/gst/gstpreset.h +++ b/gst/gstpreset.h @@ -23,7 +23,6 @@ #define __GST_PRESET_H__ #include <glib-object.h> -#include <gst/gst.h> G_BEGIN_DECLS |