playsink: The default signal handler should be the one that triggers pad blocks and...
authorSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 26 Jun 2012 09:04:23 +0000 (11:04 +0200)
committerSebastian Dröge <sebastian.droege@collabora.co.uk>
Tue, 26 Jun 2012 09:05:42 +0000 (11:05 +0200)
Conflicts:

gst/playback/gstplaysink.c

gst/playback/gstplaysink.c

index 2947ef7..4689740 100644 (file)
@@ -622,7 +622,7 @@ gst_play_sink_class_init (GstPlaySinkClass * klass)
   gstbin_klass->handle_message =
       GST_DEBUG_FUNCPTR (gst_play_sink_handle_message);
 
-  klass->reconfigure = GST_DEBUG_FUNCPTR (gst_play_sink_do_reconfigure);
+  klass->reconfigure = GST_DEBUG_FUNCPTR (gst_play_sink_reconfigure);
   klass->convert_sample = GST_DEBUG_FUNCPTR (gst_play_sink_convert_sample);
 
   _playsink_reset_segment_event_marker_id =