mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge branch 'master' into 0.11

Browse source 
Conflicts:
	gst/gstobject.c
This commit is contained in:
Wim Taymans 2011-08-24 10:43:09 +02:00
commit 6f295dc239
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gst/gstobject.c
View file

@ -84,6 +84,7 @@
*/
#include "gst_private.h"
#include "glib-compat-private.h"
#include "gstobject.h"
#include "gstmarshal.h"

3
libs/gst/base/gstbasesink.c
View file

@ -3281,6 +3281,9 @@ gst_base_sink_flush_start (GstBaseSink * basesink, GstPad * pad)
if (basesink->priv->async_enabled) {
gst_element_lost_state (GST_ELEMENT_CAST (basesink));
} else {
/* start time reset in above case as well;
* arranges for a.o. proper position reporting when flushing in PAUSED */
gst_element_set_start_time (GST_ELEMENT_CAST (basesink), 0);
basesink->priv->have_latency = TRUE;
}
gst_base_sink_set_last_buffer (basesink, NULL);