summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--gst/flx/gstflxdec.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f7d7eec9..86e7a034 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-10-06 Wim Taymans <wim@fluendo.com>
+ * gst/flx/gstflxdec.c: (gst_flxdec_init), (gst_flxdec_loop):
+ Actually _do_ negotiation. Pass gdouble as arg instead
+ of guint64 for the framerate.
+
+2004-10-06 Wim Taymans <wim@fluendo.com>
+
* gst/playback/gstdecodebin.c: (gst_decode_bin_init),
(find_compatibles), (close_pad_link), (try_to_link_1),
(no_more_pads), (close_link), (type_found):
diff --git a/gst/flx/gstflxdec.c b/gst/flx/gstflxdec.c
index 3323ca0a..68f44559 100644
--- a/gst/flx/gstflxdec.c
+++ b/gst/flx/gstflxdec.c
@@ -159,6 +159,7 @@ gst_flxdec_init (GstFlxDec * flxdec)
gst_pad_new_from_template (gst_static_pad_template_get
(&src_video_factory), "src");
gst_element_add_pad (GST_ELEMENT (flxdec), flxdec->srcpad);
+ gst_pad_use_explicit_caps (flxdec->srcpad);
flxdec->bs = NULL;
flxdec->frame = NULL;
@@ -493,7 +494,10 @@ gst_flxdec_loop (GstElement * element)
gst_caps_set_simple (caps,
"width", G_TYPE_INT, flxh->width,
"height", G_TYPE_INT, flxh->height,
- "framerate", G_TYPE_DOUBLE, GST_SECOND / flxdec->frame_time, NULL);
+ "framerate", G_TYPE_DOUBLE, (gdouble) (GST_SECOND / flxdec->frame_time),
+ NULL);
+
+ gst_pad_set_explicit_caps (flxdec->srcpad, caps);
if (flxh->depth <= 8)
flxdec->converter =