mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 00:01:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into 0.11

Browse source 
Conflicts:
	plugins/elements/gstfilesrc.c
This commit is contained in:
Tim-Philipp Müller 2011-12-25 12:47:55 +00:00
commit 81ce8b76d0
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/elements/gstfilesrc.c
View file

@ -361,8 +361,12 @@ gst_file_src_fill (GstBaseSrc * basesrc, guint64 offset, guint length,
}
/* files should eos if they read 0 and more was requested */
if (G_UNLIKELY (ret == 0))
if (G_UNLIKELY (ret == 0)) {
/* .. but first we should return any remaining data */
if (bytes_read > 0)
break;
goto eos;
}
to_read -= ret;
bytes_read += ret;