mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-04 13:45:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source 
Conflicts:
	docs/plugins/gstreamer-plugins.hierarchy
This commit is contained in:
Wim Taymans 2011-05-20 12:07:45 +02:00
parent 67cd7fd0a2 aa2bfc9b7f
commit a9edf7c6aa
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common

@ -1 +1 @@
Subproject commit 9e5bbd508588961696e70c38e764492e0312ec4c
Subproject commit 69b981f10caa234ad0ff639179d0fda8505bd94b

2
docs/plugins/gstreamer-plugins.args
View file

@ -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>

6
docs/plugins/gstreamer-plugins.interfaces
View file

@ -1,6 +1,6 @@
GstBin GstChildProxy
GstPipeline GstChildProxy
GstFdSrc GstURIHandler
GstFileSrc GstURIHandler
GstFdSink GstURIHandler
GstFdSrc GstURIHandler
GstFileSink GstURIHandler
GstFileSrc GstURIHandler
GstPipeline GstChildProxy

2
gst/gstpreset.c
View file

@ -86,6 +86,8 @@
#include "gst_private.h"
#include "gstpreset.h"
#include "gstinfo.h"
#include "gstvalue.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>

1
gst/gstpreset.h
View file

@ -23,7 +23,6 @@
#define __GST_PRESET_H__
#include <glib-object.h>
#include <gst/gst.h>
G_BEGIN_DECLS