ext/mad/: RPAD_ -> PAD

Original commit message from CVS:
* ext/mad/gstid3tag.c: (gst_id3_tag_src_link):
* ext/mad/gstmad.c: (gst_mad_chain):
RPAD_ -> PAD
Fix args in bufferalloc function call.
Makes the mad plugin compile again

diff --git a/ChangeLog b/ChangeLog
index 76364bd..7208fed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-27  Wim Taymans  <wim@fluendo.com>
+
+       * ext/mad/gstid3tag.c: (gst_id3_tag_src_link):
+       * ext/mad/gstmad.c: (gst_mad_chain):
+       RPAD_ -> PAD
+       Fix args in bufferalloc function call.
+       Makes the mad plugin compile again
+
 2005-06-27  Owen Fraser-Green  <owen@discobabe.net>
 
        * gst/realmedia/rmdemux.c: Rewrote to use gstadapter. Also parses

diff --git a/ext/mad/gstid3tag.c b/ext/mad/gstid3tag.c
index fb97695..6948db1 100644 (file)
--- a/ext/mad/gstid3tag.c
+++ b/ext/mad/gstid3tag.c
@@ -1008,7 +1008,7 @@ gst_id3_tag_src_link (GstPad * pad, GstPad * peer)
   }
 #endif
   if (GST_RPAD_LINKFUNC (peer))
-    return GST_RPAD_LINKFUNC (peer) (peer, pad);
+    return GST_PAD_LINKFUNC (peer) (peer, pad);
   else
     return GST_PAD_LINK_OK;
 }

diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c
index 93757a3..f6d09f2 100644 (file)
--- a/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
@@ -1523,9 +1523,12 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer)
         right_ch = mad->synth.pcm.samples[1];
 
         /* will attach the caps to the buffer */
-        outbuffer =
+        result =
             gst_pad_alloc_buffer (mad->srcpad, 0, nsamples * mad->channels * 2,
-            GST_PAD_CAPS (mad->srcpad));
+            GST_PAD_CAPS (mad->srcpad), &outbuffer);
+        if (result != GST_FLOW_OK)
+          goto end;
+
         outdata = (gint16 *) GST_BUFFER_DATA (outbuffer);
 
         GST_BUFFER_TIMESTAMP (outbuffer) = time_offset;