[gst-cvs] gstreamer: buffer: only warn if metadata is not writable when it should be, don't return as well

Tim Müller tpm at kemper.freedesktop.org
Fri Apr 30 05:40:12 PDT 2010


Module: gstreamer
Branch: master
Commit: 8e932639ba8434cf5ea8b010650a173f5ec8dd6d
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=8e932639ba8434cf5ea8b010650a173f5ec8dd6d

Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date:   Thu Apr 29 23:29:30 2010 +0100

buffer: only warn if metadata is not writable when it should be, don't return as well

Make sure we execute the same code path in git versions and in releases,
so just warn when metadata isn't writable when we want it to be instead
of bailing out.

---

 gst/gstbuffer.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c
index 10f11f6..ecfe033 100644
--- a/gst/gstbuffer.c
+++ b/gst/gstbuffer.c
@@ -237,7 +237,7 @@ gst_buffer_copy_metadata (GstBuffer * dest, const GstBuffer * src,
 
 #if GST_VERSION_NANO == 1
   /* we enable this extra debugging in git versions only for now */
-  g_return_if_fail (gst_buffer_is_metadata_writable (dest));
+  g_warn_if_fail (gst_buffer_is_metadata_writable (dest));
 #endif
 
   GST_CAT_LOG (GST_CAT_BUFFER, "copy %p to %p", src, dest);
@@ -487,7 +487,7 @@ gst_buffer_set_caps (GstBuffer * buffer, GstCaps * caps)
   g_return_if_fail (buffer != NULL);
 #if GST_VERSION_NANO == 1
   /* we enable this extra debugging in git versions only for now */
-  g_return_if_fail (gst_buffer_is_metadata_writable (buffer));
+  g_warn_if_fail (gst_buffer_is_metadata_writable (buffer));
 #endif
 
   gst_caps_replace (&GST_BUFFER_CAPS (buffer), caps);





More information about the Gstreamer-commits mailing list