summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2004-05-16 16:06:42 +0000
committerBenjamin Otte <otte@gnome.org>2004-05-16 16:06:42 +0000
commite268daa6af590fd9ab833d860b22dd0c24d3f6cc (patch)
treeb9b7a990a3f4fcf1a1fae8e4a25e29136f7e46ca
parent004a657005caa9c0031ce48aef0022a5fe624f43 (diff)
ext/alsa/gstalsasink.c: compute correct expected timestamps after seek (broken since last commit)
Original commit message from CVS: * ext/alsa/gstalsasink.c: (gst_alsa_sink_loop): compute correct expected timestamps after seek (broken since last commit) * ext/gdk_pixbuf/pixbufscale.c: (pixbufscale_init): rename element and debugging category to gdkpixbufscale
-rw-r--r--ChangeLog8
-rw-r--r--ext/gdk_pixbuf/pixbufscale.c4
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a42c48d0..9f243433 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
2004-05-16 Benjamin Otte <otte@gnome.org>
* ext/alsa/gstalsasink.c: (gst_alsa_sink_loop):
+ compute correct expected timestamps after seek (broken since
+ last commit)
+ * ext/gdk_pixbuf/pixbufscale.c: (pixbufscale_init):
+ rename element and debugging category to gdkpixbufscale
+
+2004-05-16 Benjamin Otte <otte@gnome.org>
+
+ * ext/alsa/gstalsasink.c: (gst_alsa_sink_loop):
add error checking to snd_pcm_delay and remove duplicate call to
snd_pcm_delay that caused issues (see inline code comments)
* ext/alsa/gstalsasink.c: (gst_alsa_sink_get_time):
diff --git a/ext/gdk_pixbuf/pixbufscale.c b/ext/gdk_pixbuf/pixbufscale.c
index 246f1968..086f1ac5 100644
--- a/ext/gdk_pixbuf/pixbufscale.c
+++ b/ext/gdk_pixbuf/pixbufscale.c
@@ -452,11 +452,11 @@ gst_pixbufscale_get_property (GObject * object, guint prop_id, GValue * value,
gboolean
pixbufscale_init (GstPlugin * plugin)
{
- if (!gst_element_register (plugin, "pixbufscale", GST_RANK_NONE,
+ if (!gst_element_register (plugin, "gdkpixbufscale", GST_RANK_NONE,
GST_TYPE_PIXBUFSCALE))
return FALSE;
- GST_DEBUG_CATEGORY_INIT (pixbufscale_debug, "pixbufscale", 0,
+ GST_DEBUG_CATEGORY_INIT (pixbufscale_debug, "gdkpixbufscale", 0,
"pixbufscale element");
return TRUE;