summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/esd/esdsink.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e7a70e38..1a4ad7c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-01-30 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ * ext/esd/esdsink.c: (gst_esdsink_init):
+ Since we have static pad template caps, we don't need to negotiate;
+ either the core errors out or we know the format.
+
+2004-01-30 Ronald Bultje <rbultje@ronald.bitfreak.net>
+
* gst-libs/gst/riff/riff-read.c: (gst_riff_peek_head),
(gst_riff_read_seek):
* gst/matroska/ebml-read.c: (gst_ebml_read_element_id),
diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c
index c0702140..e887a165 100644
--- a/ext/esd/esdsink.c
+++ b/ext/esd/esdsink.c
@@ -170,7 +170,9 @@ gst_esdsink_init(GTypeInstance *instance, gpointer g_class)
esdsink->mute = FALSE;
esdsink->fd = -1;
/* FIXME: get default from somewhere better than just putting them inline. */
- esdsink->negotiated = FALSE;
+ /*esdsink->negotiated = FALSE;*/
+ /* we have static caps on our template, so it always is negotiated */
+ esdsink->negotiated = TRUE;
esdsink->format = 16;
esdsink->depth = 16;
esdsink->channels = 2;