summaryrefslogtreecommitdiffstats
path: root/gst
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2004-10-06 13:56:07 +0000
committerWim Taymans <wim.taymans@gmail.com>2004-10-06 13:56:07 +0000
commita18ff866aaf21a5e62c9468ed8ff04df87d716b0 (patch)
tree57ef387313bc044545a79d7bc84310fce7ab16a6 /gst
parent623cb0cc6a646d55e4405ef24a81a82b404ed41f (diff)
downloadgst-plugins-bad-a18ff866aaf21a5e62c9468ed8ff04df87d716b0.tar.gz
gst-plugins-bad-a18ff866aaf21a5e62c9468ed8ff04df87d716b0.tar.bz2
gst-plugins-bad-a18ff866aaf21a5e62c9468ed8ff04df87d716b0.zip
gst/flx/gstflxdec.c: Actually _do_ negotiation. Pass gdouble as arg instead of guint64 for the framerate.
Original commit message from CVS: * gst/flx/gstflxdec.c: (gst_flxdec_init), (gst_flxdec_loop): Actually _do_ negotiation. Pass gdouble as arg instead of guint64 for the framerate.
Diffstat (limited to 'gst')
-rw-r--r--gst/flx/gstflxdec.c6
1 files changed, 5 insertions, 1 deletions
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 =