From c06e12f42f1e3a86fff68005bfe559428d744d64 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Tue, 5 Oct 2004 08:52:37 +0000 Subject: [PATCH] configure.ac Original commit message from CVS: configure.ac --- ChangeLog | 9 +++++++++ configure.ac | 2 +- gst/elements/gstfakesrc.c | 3 ++- gst/elements/gstidentity.c | 4 +++- gst/gstthread.c | 4 +++- plugins/elements/gstfakesrc.c | 3 ++- plugins/elements/gstidentity.c | 4 +++- 7 files changed, 23 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3912863..add9277 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-10-05 Thomas Vander Stichele + + reviewed by: + + * configure.ac: + * gst/elements/gstfakesrc.c: + * gst/elements/gstidentity.c: + * gst/gstthread.c: + 2004-10-01 Wim Taymans * libs/gst/dataprotocol/dataprotocol.c: (gst_dp_crc): diff --git a/configure.ac b/configure.ac index 9f093af..f09af19 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_CANONICAL_TARGET dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AS_VERSION(gstreamer, GST_VERSION, 0, 8, 5, 2, GST_CVS="no", GST_CVS="yes") +AS_VERSION(gstreamer, GST_VERSION, 0, 8, 5, 3, GST_CVS="no", GST_CVS="yes") dnl AM_MAINTAINER_MODE only provides the option to configure to enable it AM_MAINTAINER_MODE diff --git a/gst/elements/gstfakesrc.c b/gst/elements/gstfakesrc.c index 3aad6958..ef3c54d 100644 --- a/gst/elements/gstfakesrc.c +++ b/gst/elements/gstfakesrc.c @@ -795,6 +795,7 @@ gst_fakesrc_get (GstPad * pad) { GstFakeSrc *src; GstBuffer *buf; + GstClockTime time; g_return_val_if_fail (pad != NULL, NULL); @@ -832,7 +833,7 @@ gst_fakesrc_get (GstPad * pad) buf = gst_fakesrc_create_buffer (src); GST_BUFFER_OFFSET (buf) = src->buffer_count++; - GstClockTime time = GST_CLOCK_TIME_NONE; + time = GST_CLOCK_TIME_NONE; if (src->datarate > 0) { time = (src->bytes_sent * GST_SECOND) / src->datarate; diff --git a/gst/elements/gstidentity.c b/gst/elements/gstidentity.c index 9e416cd..8f9f741 100644 --- a/gst/elements/gstidentity.c +++ b/gst/elements/gstidentity.c @@ -326,6 +326,8 @@ gst_identity_chain (GstPad * pad, GstData * _data) } for (i = identity->duplicate; i; i--) { + GstClockTime time; + if (!identity->silent) { g_free (identity->last_message); identity->last_message = @@ -339,7 +341,7 @@ gst_identity_chain (GstPad * pad, GstData * _data) g_object_notify (G_OBJECT (identity), "last-message"); } - GstClockTime time = GST_BUFFER_TIMESTAMP (buf); + time = GST_BUFFER_TIMESTAMP (buf); if (identity->datarate > 0) { time = identity->bytes_handled * GST_SECOND / identity->datarate; diff --git a/gst/gstthread.c b/gst/gstthread.c index 3f07c5b..2a538de 100644 --- a/gst/gstthread.c +++ b/gst/gstthread.c @@ -491,9 +491,11 @@ gst_thread_change_state (GstElement * element) } case GST_STATE_PLAYING_TO_PAUSED: { + GList *elements; + GST_FLAG_UNSET (thread, GST_THREAD_STATE_SPINNING); - GList *elements = (GList *) gst_bin_get_list (GST_BIN (thread)); + elements = (GList *) gst_bin_get_list (GST_BIN (thread)); while (elements) { gst_element_disable_threadsafe_properties ((GstElement *) elements-> diff --git a/plugins/elements/gstfakesrc.c b/plugins/elements/gstfakesrc.c index 3aad6958..ef3c54d 100644 --- a/plugins/elements/gstfakesrc.c +++ b/plugins/elements/gstfakesrc.c @@ -795,6 +795,7 @@ gst_fakesrc_get (GstPad * pad) { GstFakeSrc *src; GstBuffer *buf; + GstClockTime time; g_return_val_if_fail (pad != NULL, NULL); @@ -832,7 +833,7 @@ gst_fakesrc_get (GstPad * pad) buf = gst_fakesrc_create_buffer (src); GST_BUFFER_OFFSET (buf) = src->buffer_count++; - GstClockTime time = GST_CLOCK_TIME_NONE; + time = GST_CLOCK_TIME_NONE; if (src->datarate > 0) { time = (src->bytes_sent * GST_SECOND) / src->datarate; diff --git a/plugins/elements/gstidentity.c b/plugins/elements/gstidentity.c index 9e416cd..8f9f741 100644 --- a/plugins/elements/gstidentity.c +++ b/plugins/elements/gstidentity.c @@ -326,6 +326,8 @@ gst_identity_chain (GstPad * pad, GstData * _data) } for (i = identity->duplicate; i; i--) { + GstClockTime time; + if (!identity->silent) { g_free (identity->last_message); identity->last_message = @@ -339,7 +341,7 @@ gst_identity_chain (GstPad * pad, GstData * _data) g_object_notify (G_OBJECT (identity), "last-message"); } - GstClockTime time = GST_BUFFER_TIMESTAMP (buf); + time = GST_BUFFER_TIMESTAMP (buf); if (identity->datarate > 0) { time = identity->bytes_handled * GST_SECOND / identity->datarate; -- 2.7.4