gst/gstbuffer.c (gst_buffer_default_copy): Don't forget to merge the flags from the...

Original commit message from CVS:
* gst/gstbuffer.c (gst_buffer_default_copy): Don't forget to merge
the flags from the buffer we're copying.

diff --git a/ChangeLog b/ChangeLog
index 7365962..2b9c467 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-09  Johan Dahlin  <johan@gnome.org>
+
+       * gst/gstbuffer.c (gst_buffer_default_copy): Don't forget to merge
+       the flags from the buffer we're copying.
+
 2004-06-09  Wim Taymans  <wim@fluendo.com>
 
        * gst/elements/gstfakesink.c: (gst_fakesink_chain):

diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index e9d13c5..97445f9 100644 (file)
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -150,6 +150,7 @@ gst_buffer_default_copy (GstBuffer * buffer)
   /* copy relevant flags */
   flags = GST_DATA_FLAG_SHIFT (GST_BUFFER_KEY_UNIT) |
       GST_DATA_FLAG_SHIFT (GST_BUFFER_IN_CAPS);
+  flags = GST_BUFFER_FLAGS (buffer) & flags;
 
   _GST_DATA_INIT (GST_DATA (copy),
       _gst_buffer_type,