summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2009-01-09 23:13:17 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2009-01-09 23:13:17 +0000
commit80ac3b565ed0bdd4e42e04bcf53b715f78721a10 (patch)
tree795e5f5a080c0b65db049bfb6d689c95fb6a51a4
parentd629c9fc17a1b6864bcb92c8b33f1c6ced020f8b (diff)
gst-libs/gst/app/gstappsink.c: Store the returned signal id in the right slot when registering the pull-buffer signal.
Original commit message from CVS: * gst-libs/gst/app/gstappsink.c: Store the returned signal id in the right slot when registering the pull-buffer signal. Fixes #567168 Spotted by: Thomas Vander Stichele <thomas at apestaart dot org>
-rw-r--r--ChangeLog8
-rw-r--r--gst-libs/gst/app/gstappsink.c2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 09aaecc3..6eff1f3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-01-09 Jan Schmidt <jan.schmidt@sun.com>
+
+ * gst-libs/gst/app/gstappsink.c:
+ Store the returned signal id in the right slot when
+ registering the pull-buffer signal.
+ Fixes #567168
+ Spotted by: Thomas Vander Stichele <thomas at apestaart dot org>
+
2009-01-09 Tim-Philipp Müller <tim.muller at collabora co uk>
* gst-libs/gst/interfaces/mixer.c:
diff --git a/gst-libs/gst/app/gstappsink.c b/gst-libs/gst/app/gstappsink.c
index 8be5385e..673426fa 100644
--- a/gst-libs/gst/app/gstappsink.c
+++ b/gst-libs/gst/app/gstappsink.c
@@ -353,7 +353,7 @@ gst_app_sink_class_init (GstAppSinkClass * klass)
*
* Returns: a #GstBuffer or NULL when the appsink is stopped or EOS.
*/
- gst_app_sink_signals[SIGNAL_PULL_PREROLL] =
+ gst_app_sink_signals[SIGNAL_PULL_BUFFER] =
g_signal_new ("pull-buffer", G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_STRUCT_OFFSET (GstAppSinkClass,
pull_buffer), NULL, NULL, gst_app_marshal_OBJECT__VOID,