Fix compilation again.

Original commit message from CVS:
Fix compilation again.

2 files changed, 54 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 888c46e6..5e680464 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,48 @@
+2005-02-16  Wim Taymans  <wim@fluendo.com>
+
+	* ext/mad/gstmad.c: (gst_mad_init), (gst_mad_src_event),
+	(gst_mad_update_info), (gst_mad_sink_event),
+	(gst_mad_check_caps_reset), (gst_mad_chain),
+	(gst_mad_change_state):
+	* ext/ogg/gstoggdemux.c: (gst_ogg_pad_get_type),
+	(gst_ogg_pad_init), (gst_ogg_pad_dispose), (gst_ogg_pad_src_query),
+	(gst_ogg_pad_event), (gst_ogg_demux_factory_filter),
+	(compare_ranks), (gst_ogg_pad_internal_chain),
+	(gst_ogg_pad_typefind), (gst_ogg_pad_submit_packet),
+	(gst_ogg_pad_submit_page), (gst_ogg_chain_new),
+	(gst_ogg_chain_free), (gst_ogg_chain_new_stream),
+	(gst_ogg_chain_get_stream), (gst_ogg_chain_has_stream),
+	(gst_ogg_demux_base_init), (gst_ogg_demux_init),
+	(gst_ogg_demux_submit_buffer), (gst_ogg_demux_seek),
+	(gst_ogg_demux_get_data), (gst_ogg_demux_get_next_page),
+	(gst_ogg_demux_get_prev_page),
+	(gst_ogg_demux_deactivate_current_chain),
+	(gst_ogg_demux_activate_chain), (gst_ogg_demux_perform_seek),
+	(gst_ogg_demux_bisect_forward_serialno),
+	(gst_ogg_demux_read_chain), (gst_ogg_demux_read_end_chain),
+	(gst_ogg_demux_find_pad), (gst_ogg_demux_find_chain),
+	(gst_ogg_demux_find_chains), (gst_ogg_demux_chain_unlocked),
+	(gst_ogg_demux_chain), (gst_ogg_demux_send_eos),
+	(gst_ogg_demux_loop), (gst_ogg_demux_sink_activate),
+	(gst_ogg_print):
+	* ext/ogg/gstogmparse.c: (gst_ogm_parse_chain):
+	* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_chain),
+	(gst_audio_convert_caps_remove_format_info),
+	(gst_audio_convert_setcaps), (gst_audio_convert_fixate),
+	(gst_audio_convert_channels):
+	* gst/avi/gstavidemux.c: (gst_avi_demux_src_convert),
+	(gst_avi_demux_handle_src_query), (gst_avi_demux_handle_src_event),
+	(gst_avi_demux_loop):
+	* gst/ffmpegcolorspace/gstffmpegcolorspace.c:
+	(gst_ffmpegcsp_caps_remove_format_info),
+	(gst_ffmpegcsp_configure_context), (gst_ffmpegcsp_setcaps),
+	(gst_ffmpegcsp_chain):
+	* sys/xvimage/xvimagesink.c: (gst_xvimagesink_sink_link),
+	(gst_xvimagesink_change_state), (gst_xvimagesink_event),
+	(gst_xvimagesink_show_frame), (gst_xvimagesink_finish_preroll),
+	(gst_xvimagesink_chain), (gst_xvimagesink_buffer_alloc):
+	Fix compilation again.
+
 2005-02-05  Ronald S. Bultje  <rbultje@ronald.bitfreak.net>
 
 	* examples/seeking/seek.c: (make_avi_msmpeg4v3_mp3_pipeline):
diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c
index 9057c687..703967be 100644
--- a/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
@@ -743,14 +743,6 @@ gst_mad_src_event (GstPad * pad, GstEvent * event)
   mad = GST_MAD (GST_PAD_PARENT (pad));
 
   switch (GST_EVENT_TYPE (event)) {
-    case GST_EVENT_SEEK_SEGMENT:
-      GST_DEBUG ("forwarding seek event to sink pad");
-      gst_event_ref (event);
-      if (gst_pad_send_event (GST_PAD_PEER (mad->sinkpad), event)) {
-        /* seek worked, we're done, loop will exit */
-        res = TRUE;
-      }
-      break;
       /* the all-formats seek logic */
     case GST_EVENT_SEEK:
       if (mad->index)
@@ -1203,6 +1195,8 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer)
   mad = GST_MAD (GST_PAD_PARENT (pad));
   g_return_val_if_fail (GST_IS_MAD (mad), GST_FLOW_ERROR);
 
+  GST_STREAM_LOCK (pad);
+
   /* restarts happen on discontinuities, ie. seek, flush, PAUSED to PLAYING */
   if (gst_mad_check_restart (mad))
     GST_DEBUG ("mad restarted");
@@ -1245,7 +1239,8 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer)
       GST_ELEMENT_ERROR (mad, STREAM, DECODE, (NULL),
           ("mad claims to need more data than %u bytes, we don't have that much",
               MAD_BUFFER_MDLEN * 3));
-      return GST_FLOW_ERROR;
+      result = GST_FLOW_ERROR;
+      goto end;
     }
 
     /* append the chunk to process to our internal temporary buffer */
@@ -1302,7 +1297,8 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer)
             mad_stream_errorstr (&mad->stream));
         if (!MAD_RECOVERABLE (mad->stream.error)) {
           GST_ELEMENT_ERROR (mad, STREAM, DECODE, (NULL), (NULL));
-          return GST_FLOW_ERROR;
+          result = GST_FLOW_ERROR;
+          goto end;
         } else if (mad->stream.error == MAD_ERROR_LOSTSYNC) {
           /* lost sync, force a resync */
           signed long tagsize;
@@ -1507,6 +1503,7 @@ gst_mad_chain (GstPad * pad, GstBuffer * buffer)
   result = GST_FLOW_OK;
 
 end:
+  GST_STREAM_UNLOCK (pad);
   gst_buffer_unref (buffer);
 
   return result;
@@ -1555,6 +1552,7 @@ gst_mad_change_state (GstElement * element)
     case GST_STATE_PLAYING_TO_PAUSED:
       break;
     case GST_STATE_PAUSED_TO_READY:
+      GST_STREAM_LOCK (mad->sinkpad);
       mad_synth_finish (&mad->synth);
       mad_frame_finish (&mad->frame);
       mad_stream_finish (&mad->stream);
@@ -1563,6 +1561,7 @@ gst_mad_change_state (GstElement * element)
         gst_tag_list_free (mad->tags);
         mad->tags = NULL;
       }
+      GST_STREAM_UNLOCK (mad->sinkpad);
       break;
     case GST_STATE_READY_TO_NULL:
       break;