mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-04 07:26:33 +00:00
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.
This commit is contained in:
parent
40b2248a3a
commit
9f1d61a785
2 changed files with 11 additions and 1 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
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>
|
2004-10-06 Wim Taymans <wim@fluendo.com>
|
||||||
|
|
||||||
* gst/playback/gstdecodebin.c: (gst_decode_bin_init),
|
* gst/playback/gstdecodebin.c: (gst_decode_bin_init),
|
||||||
|
|
|
@ -159,6 +159,7 @@ gst_flxdec_init (GstFlxDec * flxdec)
|
||||||
gst_pad_new_from_template (gst_static_pad_template_get
|
gst_pad_new_from_template (gst_static_pad_template_get
|
||||||
(&src_video_factory), "src");
|
(&src_video_factory), "src");
|
||||||
gst_element_add_pad (GST_ELEMENT (flxdec), flxdec->srcpad);
|
gst_element_add_pad (GST_ELEMENT (flxdec), flxdec->srcpad);
|
||||||
|
gst_pad_use_explicit_caps (flxdec->srcpad);
|
||||||
|
|
||||||
flxdec->bs = NULL;
|
flxdec->bs = NULL;
|
||||||
flxdec->frame = NULL;
|
flxdec->frame = NULL;
|
||||||
|
@ -493,7 +494,10 @@ gst_flxdec_loop (GstElement * element)
|
||||||
gst_caps_set_simple (caps,
|
gst_caps_set_simple (caps,
|
||||||
"width", G_TYPE_INT, flxh->width,
|
"width", G_TYPE_INT, flxh->width,
|
||||||
"height", G_TYPE_INT, flxh->height,
|
"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)
|
if (flxh->depth <= 8)
|
||||||
flxdec->converter =
|
flxdec->converter =
|
||||||
|
|
Loading…
Reference in a new issue