diff options
| author | Kwang Yul Seo <kwangyul.seo@gmail.com> | 2007-12-09 05:02:17 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@circular-chaos.org> | 2007-12-09 05:02:17 +0000 |
| commit | 1e28a6937131f4b09be6464aefe3dbfbeef89086 (patch) | |
| tree | 708a1381d51b3f211930d9560622e8b5ae45b420 | |
| parent | 7ea8f11b9a2ff2f78003c7e0ad400800552533d0 (diff) | |
Fix compilation with MSVC by using gst_util_guint64_to_gdouble() and checking for rint() and implementing it ourself ...
Original commit message from CVS:
Based on a patch by: Kwang Yul Seo <kwangyul dot seo at gmail dot com>
* configure.ac:
* ext/cairo/gsttimeoverlay.c:
(gst_cairo_time_overlay_print_smpte_time):
Fix compilation with MSVC by using gst_util_guint64_to_gdouble()
and checking for rint() and implementing it ourself if it doesn't
exist.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | ext/cairo/gsttimeoverlay.c | 6 |
3 files changed, 21 insertions, 1 deletions
@@ -1,5 +1,16 @@ 2007-12-09 Sebastian Dröge <slomo@circular-chaos.org> + Based on a patch by: Kwang Yul Seo <kwangyul dot seo at gmail dot com> + + * configure.ac: + * ext/cairo/gsttimeoverlay.c: + (gst_cairo_time_overlay_print_smpte_time): + Fix compilation with MSVC by using gst_util_guint64_to_gdouble() + and checking for rint() and implementing it ourself if it doesn't + exist. + +2007-12-09 Sebastian Dröge <slomo@circular-chaos.org> + * configure.ac: Don't define GST_DISABLE_DEPRECATED for releases. Fixes #498181. diff --git a/configure.ac b/configure.ac index 592e4a25..286161b0 100644 --- a/configure.ac +++ b/configure.ac @@ -218,6 +218,11 @@ AC_C99_FUNC_LRINTF dnl *** checks for library functions *** +LIBS_SAVE=$LIBS +LIBS="$LIBS $LIBM" +AC_CHECK_FUNCS(rint) +$LIBS=$LIB_SAVE + dnl Check for mmap (needed by electricfence plugin) AC_FUNC_MMAP AM_CONDITIONAL(GST_HAVE_MMAP, test "x$ac_cv_func_mmap_fixed_mapped" == "xyes") diff --git a/ext/cairo/gsttimeoverlay.c b/ext/cairo/gsttimeoverlay.c index 16707916..8f1d03d1 100644 --- a/ext/cairo/gsttimeoverlay.c +++ b/ext/cairo/gsttimeoverlay.c @@ -48,6 +48,10 @@ #include <gst/video/video.h> +#ifndef HAVE_RINT +#define rint(x) ((double) floor((x)+(((x) < 0)? -0.5 : 0.5))) +#endif + static const GstElementDetails cairo_time_overlay_details = GST_ELEMENT_DETAILS ("Time overlay", "Filter/Editor/Video", @@ -159,7 +163,7 @@ gst_cairo_time_overlay_print_smpte_time (guint64 time) int ms; double x; - x = rint ((time + 500000) * 1e-6); + x = rint (gst_util_guint64_to_gdouble (time + 500000) * 1e-6); hours = floor (x / (60 * 60 * 1000)); x -= hours * 60 * 60 * 1000; |