summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2008-06-16 14:11:36 +0000
committerAndy Wingo <wingo@pobox.com>2008-06-16 14:11:36 +0000
commit004d1d0f9fd6bbb1148d784fc5ee227b69538c06 (patch)
treeaf2b20784cb9c308e1cc73e3fbb9b75d0747e7f0
parent04c53e454a58dda4883afd5193e1b26933a2aae2 (diff)
downloadgst-plugins-bad-004d1d0f9fd6bbb1148d784fc5ee227b69538c06.tar.gz
gst-plugins-bad-004d1d0f9fd6bbb1148d784fc5ee227b69538c06.tar.bz2
gst-plugins-bad-004d1d0f9fd6bbb1148d784fc5ee227b69538c06.zip
gst-libs/gst/app/gstappsrc.c (gst_app_src_set_max_bytes)
Original commit message from CVS: 2008-06-16 Andy Wingo <wingo@pobox.com> * gst-libs/gst/app/gstappsrc.c (gst_app_src_set_max_bytes) (gst_app_src_get_max_bytes, gst_app_src_push_buffer): Use G_GUINT64_FORMAT. Avoid overflow in get_max_bytes().
-rw-r--r--ChangeLog6
-rw-r--r--gst-libs/gst/app/gstappsrc.c10
2 files changed, 11 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a986011..b5fa43d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-16 Andy Wingo <wingo@pobox.com>
+
+ * gst-libs/gst/app/gstappsrc.c (gst_app_src_set_max_bytes)
+ (gst_app_src_get_max_bytes, gst_app_src_push_buffer): Use
+ G_GUINT64_FORMAT. Avoid overflow in get_max_bytes().
+
2008-06-16 Stefan Kost <ensonic@users.sf.net>
* sys/dvb/gstdvbsrc.c:
diff --git a/gst-libs/gst/app/gstappsrc.c b/gst-libs/gst/app/gstappsrc.c
index c98eac51..8f726b7c 100644
--- a/gst-libs/gst/app/gstappsrc.c
+++ b/gst-libs/gst/app/gstappsrc.c
@@ -820,7 +820,7 @@ gst_app_src_set_max_bytes (GstAppSrc * appsrc, guint64 max)
g_mutex_lock (appsrc->mutex);
if (max != appsrc->max_bytes) {
- GST_DEBUG_OBJECT (appsrc, "setting max-bytes to %u", max);
+ GST_DEBUG_OBJECT (appsrc, "setting max-bytes to %" G_GUINT64_FORMAT, max);
appsrc->max_bytes = max;
/* signal the change */
g_cond_broadcast (appsrc->cond);
@@ -839,13 +839,13 @@ gst_app_src_set_max_bytes (GstAppSrc * appsrc, guint64 max)
guint64
gst_app_src_get_max_bytes (GstAppSrc * appsrc)
{
- guint result;
+ guint64 result;
g_return_val_if_fail (GST_IS_APP_SRC (appsrc), 0);
g_mutex_lock (appsrc->mutex);
result = appsrc->max_bytes;
- GST_DEBUG_OBJECT (appsrc, "getting max-bytes of %u", result);
+ GST_DEBUG_OBJECT (appsrc, "getting max-bytes of %" G_GUINT64_FORMAT, result);
g_mutex_unlock (appsrc->mutex);
return result;
@@ -883,8 +883,8 @@ gst_app_src_push_buffer (GstAppSrc * appsrc, GstBuffer * buffer)
goto eos;
if (appsrc->queued_bytes >= appsrc->max_bytes) {
- GST_DEBUG_OBJECT (appsrc, "queue filled (%u >= %u)",
- appsrc->queued_bytes, appsrc->max_bytes);
+ GST_DEBUG_OBJECT (appsrc, "queue filled (%" G_GUINT64_FORMAT " >= %"
+ G_GUINT64_FORMAT ")", appsrc->queued_bytes, appsrc->max_bytes);
if (first) {
/* only signal on the first push */