mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.10'

Browse source 
Conflicts:
	gst/gstatomicqueue.c
This commit is contained in:
Tim-Philipp Müller 2012-04-07 15:42:08 +01:00
commit 4348851cd9
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/elements/gstfilesrc.c
View file

@ -209,6 +209,8 @@ gst_file_src_init (GstFileSrc * src)
src->uri = NULL;
src->is_regular = FALSE;
gst_base_src_set_blocksize (GST_BASE_SRC (src), DEFAULT_BLOCKSIZE);
}
static void

6
plugins/elements/gstqueue2.c
View file

@ -2609,12 +2609,6 @@ gst_queue2_handle_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
/* now unblock the getrange function */
GST_QUEUE2_MUTEX_LOCK (queue);
queue->srcresult = GST_FLOW_OK;
if (queue->current) {
/* forget the highest read offset, we'll calculate a new one when we
* get the next getrange request. We need to do this in order to reset
* the buffering percentage */
queue->current->max_reading_pos = 0;
}
GST_QUEUE2_MUTEX_UNLOCK (queue);
/* when using a temp file, we eat the event */