linked to a pending change in core

Original commit message from CVS:
linked to a pending change in core

diff --git a/common b/common
index bca2dfba7bfc36020b5ba26b640ebde4cc76a5f0..355c616d5f6779ea194f8b61704229c6fb04ae7b 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit bca2dfba7bfc36020b5ba26b640ebde4cc76a5f0
+Subproject commit 355c616d5f6779ea194f8b61704229c6fb04ae7b

diff --git a/gst/avi/audiocodecs.c b/gst/avi/audiocodecs.c
index c734957e86e37fdd416fbbae85e4642bdb622900..b362932875a4b424fdf59fc993d02d55e80bfa21 100644 (file)
--- a/gst/avi/audiocodecs.c
+++ b/gst/avi/audiocodecs.c
@@ -94,7 +94,7 @@ static GstPad *gst_avi_decoder_get_audio_srcpad_MPEG(GstAviDecoder *avi_decoder,
   gst_bin_add(GST_BIN(gst_object_get_parent(GST_OBJECT(avi_decoder))), decode);
 
   newpad = gst_pad_new("video", GST_PAD_SRC);
   gst_bin_add(GST_BIN(gst_object_get_parent(GST_OBJECT(avi_decoder))), decode);
 
   newpad = gst_pad_new("video", GST_PAD_SRC);

-  gst_pad_set_parent(newpad, GST_OBJECT(avi_decoder));
+  gst_pad_set_parent(newpad, GST_ELEMENT(avi_decoder));

 
   sinkpad = gst_element_get_pad(parse_audio,"sink");
   gst_pad_connect(gst_element_get_pad(parse_audio,"src"),
 
   sinkpad = gst_element_get_pad(parse_audio,"sink");
   gst_pad_connect(gst_element_get_pad(parse_audio,"src"),


@@ -164,11 +164,11 @@ static GstPad *gst_avi_decoder_get_audio_srcpad_winloader(GstAviDecoder *avi_dec
   }
 
   newpad = gst_pad_new("audio", GST_PAD_SINK);
   }
 
   newpad = gst_pad_new("audio", GST_PAD_SINK);

-  gst_pad_set_parent(newpad, GST_OBJECT(avi_decoder));
+  gst_pad_set_parent(newpad, GST_ELEMENT(avi_decoder));

   gst_pad_set_chain_function(newpad, gst_avi_decoder_winloader_audio_chain);
 
   sinkpad = gst_pad_new("audio_00", GST_PAD_SRC);
   gst_pad_set_chain_function(newpad, gst_avi_decoder_winloader_audio_chain);
 
   sinkpad = gst_pad_new("audio_00", GST_PAD_SRC);

-  gst_pad_set_parent(sinkpad, GST_OBJECT(avi_decoder));
+  gst_pad_set_parent(sinkpad, GST_ELEMENT(avi_decoder));

   gst_pad_connect(newpad, sinkpad);
   gst_pad_set_chain_function (newpad, GST_RPAD_CHAINFUNC (sinkpad));
 
   gst_pad_connect(newpad, sinkpad);
   gst_pad_set_chain_function (newpad, GST_RPAD_CHAINFUNC (sinkpad));