[gst-cvs] company gstreamer: gstreamer/ gstreamer/gst/elements/

[<co...@fr...>]

CVS Root:       /cvs/gstreamer
Module:         gstreamer
Changes by:     company
Date:           Tue Nov 30 2004  15:45:48 PST

Log message:
* gst/elements/gstbufferstore.c:
(gst_buffer_store_add_buffer_func):
don't try to make subbuffers bigger than they can be. (fixes
#159970)

Modified files:
    .               : ChangeLog
    gst/elements    : gstbufferstore.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.849&r2=1.850
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstbufferstore.c.diff?r1=1.14&r2=1.15

====Begin Diffs====
Index: ChangeLog
===================================================================
RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v
retrieving revision 1.849
retrieving revision 1.850
diff -u -d -r1.849 -r1.850
--- ChangeLog	29 Nov 2004 18:29:05 -0000	1.849
+++ ChangeLog	30 Nov 2004 23:45:35 -0000	1.850
@@ -1,3 +1,10 @@
+2004-12-01  Benjamin Otte  <ot...@gn...>
+
+	* gst/elements/gstbufferstore.c:
+	(gst_buffer_store_add_buffer_func):
+	  don't try to make subbuffers bigger than they can be. (fixes
+	  #159970)
 2004-11-29  Ronald S. Bultje  <rb...@ro...>
 
 	* docs/gst/gstreamer-sections.txt:
Index: gstbufferstore.c
RCS file: /cvs/gstreamer/gstreamer/gst/elements/gstbufferstore.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gstbufferstore.c	6 Apr 2004 23:46:37 -0000	1.14
+++ gstbufferstore.c	30 Nov 2004 23:45:36 -0000	1.15
@@ -208,7 +208,7 @@
             start_offset = GST_BUFFER_OFFSET (buffer) > start_offset ? 0 :
                 start_offset - GST_BUFFER_OFFSET (buffer);
             sub = gst_buffer_create_sub (buffer, start_offset,
-                MIN (GST_BUFFER_SIZE (buffer),
+                MIN (GST_BUFFER_SIZE (buffer) - start_offset,
                     GST_BUFFER_OFFSET (current) - start_offset -
                     GST_BUFFER_OFFSET (buffer)));
             g_assert (sub);