diff --git a/ChangeLog b/ChangeLog index c43c566e24..8381c720e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-10-26 Wim Taymans + + * ext/dv/gstdvdec.c: (gst_dvdec_video_getcaps), + (gst_dvdec_video_link), (gst_dvdec_push), (gst_dvdec_loop): + Allow a little margin when negotiating the framerate. + 2004-10-26 Stefan Kost * gst/level/gstlevel.c: diff --git a/ext/dv/gstdvdec.c b/ext/dv/gstdvdec.c index ea891585cb..19bf308f88 100644 --- a/ext/dv/gstdvdec.c +++ b/ext/dv/gstdvdec.c @@ -21,6 +21,7 @@ #include "config.h" #endif #include +#include /* First, include the header file for the plugin, to bring in the * object definition and other useful things. @@ -824,8 +825,9 @@ gst_dvdec_video_link (GstPad * pad, const GstCaps * caps) !gst_structure_get_double (structure, "framerate", &framerate)) return GST_PAD_LINK_REFUSED; - if ((height != dvdec->height) - || (framerate != dvdec->framerate / dvdec->drop_factor)) + /* allow a margin of error for the framerate caused by float rounding errors */ + if ((height != dvdec->height) || + (fabs (framerate - (dvdec->framerate / dvdec->drop_factor)) > 0.00000001)) return GST_PAD_LINK_REFUSED; if (strcmp (gst_structure_get_name (structure), "video/x-raw-rgb") == 0) {