From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Mon, 15 Jul 2002 11:40:29 +0000 (+0000)
Subject: merge fix
X-Git-Tag: 1.19.3~509^2~16363
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a8b1136da3a8206610f9d7da82039d632a09c7dd;p=platform%2Fupstream%2Fgstreamer.git

merge fix

Original commit message from CVS:
merge fix
---

diff --git a/gst/cutter/gstcutter.c b/gst/cutter/gstcutter.c
index 0e4c6e8..4b400c6 100644
--- a/gst/cutter/gstcutter.c
+++ b/gst/cutter/gstcutter.c
@@ -207,7 +207,6 @@ gst_cutter_chain (GstPad *pad, GstBuffer *buf)
   g_return_if_fail (filter != NULL);
   g_return_if_fail (GST_IS_CUTTER (filter));
 
-  /* FIXME: this doesn't seem to be working well anymore */
   if (gst_audio_is_buffer_framed (pad, buf) == FALSE)
     g_warning ("cutter: audio buffer is not framed !\n");