Index: gst-libs/gst/audio/audio.h
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/gst-libs/gst/audio/audio.h,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 audio.h
--- gst-libs/gst/audio/audio.h	23 Jul 2007 18:26:09 -0000	1.27
+++ gst-libs/gst/audio/audio.h	17 Aug 2007 14:47:39 -0000
@@ -58,7 +58,7 @@ G_BEGIN_DECLS
  * Calculate clocktime from sample @frames and @rate.
  */
 #define GST_FRAMES_TO_CLOCK_TIME(frames, rate) \
-  ((GstClockTime) (((gdouble) frames / rate) * GST_SECOND))
+  gst_util_uint64_scale (frames, GST_SECOND, rate)
 
 /**
  * GST_CLOCK_TIME_TO_FRAMES:
@@ -68,7 +68,7 @@ G_BEGIN_DECLS
  * Calculate frames from @clocktime and sample @rate.
  */
 #define GST_CLOCK_TIME_TO_FRAMES(clocktime, rate) \
-  ((gint64) ((gst_guint64_to_gdouble (clocktime) / GST_SECOND) * rate))
+  gst_util_uint64_scale (clocktime, rate, GST_SECOND)
 
 /**
  * GST_AUDIO_DEF_RATE:
