mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-15 12:34:15 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source
This commit is contained in:
Wim Taymans 2011-08-15 14:43:14 +02:00
commit e01b5c0f46
4 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/pwg/advanced-types.xml
View file

@ -774,7 +774,7 @@ plugin_init (GstPlugin *plugin)
<row>
<entry morerows="3">video/x-raw-rgb</entry>
<entry morerows="3">Red-Green-Blue (RBG) video.</entry>
<entry morerows="3">Red-Green-Blue (RGB) video.</entry>
<entry>bpp</entry>
<entry>integer</entry>
<entry>greater than 0</entry>

2
gst/gstdebugutils.c
View file

@ -458,8 +458,6 @@ debug_dump_element_pad_link (GstPad * pad, GstElement * element,
}
}
/* New function
*/
static void
debug_dump_element_pads (GstIterator * pad_iter, GstPad * pad,
GstElement * element, GstDebugGraphDetails details, FILE * out,

4
plugins/elements/gstqueue2.c
View file

@ -2804,17 +2804,15 @@ gst_queue2_src_activate_pull (GstPad * pad, gboolean active)
queue->is_eos = FALSE;
queue->unexpected = FALSE;
queue->upstream_size = 0;
GST_QUEUE2_MUTEX_UNLOCK (queue);
} else {
GST_QUEUE2_MUTEX_LOCK (queue);
GST_DEBUG_OBJECT (queue, "no temp file, cannot activate pull mode");
/* this is not allowed, we cannot operate in pull mode without a temp
* file. */
queue->srcresult = GST_FLOW_WRONG_STATE;
queue->sinkresult = GST_FLOW_WRONG_STATE;
result = FALSE;
GST_QUEUE2_MUTEX_UNLOCK (queue);
}
GST_QUEUE2_MUTEX_UNLOCK (queue);
} else {
GST_QUEUE2_MUTEX_LOCK (queue);
GST_DEBUG_OBJECT (queue, "deactivating pull mode");

5
scripts/gst-uninstalled
View file

@ -100,6 +100,8 @@ $GST_PREFIX/lib/pkgconfig\
:$GST/gst-python/pkgconfig\
:$GST/gst-rtsp-server/pkgconfig\
:$GST/gstreamer-sharp/pkgconfig\
:$GST/farsight2\
:$GST/libnice/nice\
${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}"
export GST_PLUGIN_PATH="\
@ -121,6 +123,9 @@ $GST/gstreamer/plugins\
:$GST/gst-openmax\
:$GST/gst-plugins-gl/gst\
:$GST/plugins\
:$GST/farsight2/gst\
:$GST/farsight2/transmitters\
:$GST/libnice/gst\
${GST_PLUGIN_PATH:+:$GST_PLUGIN_PATH}"
# don't use any system-installed plug-ins at all