[vlc-devel] commit: Revert "CLOCK_FREQ is a 64-bits quantity as mtime_t" ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Wed Sep  3 21:01:22 2008 +0300| [bbebf410c6732da43387d3e2745d705b7e845337] | committer: Rémi Denis-Courmont 

Revert "CLOCK_FREQ is a 64-bits quantity as mtime_t"

This reverts commit df65d65771fc440f134d10ea80c86e9f6f2051f6.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=bbebf410c6732da43387d3e2745d705b7e845337
---

 include/vlc_config.h       |    2 +-
 modules/demux/rtpsession.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/vlc_config.h b/include/vlc_config.h
index 502af4c..4a51435 100644
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -38,7 +38,7 @@
  * General configuration
  *****************************************************************************/
 
-#define CLOCK_FREQ (UINT64_C(1000000))
+#define CLOCK_FREQ 1000000
 
 
 /* When creating or destroying threads in blocking mode, delay to poll thread
diff --git a/modules/demux/rtpsession.c b/modules/demux/rtpsession.c
index dc025e3..ccad284 100644
--- a/modules/demux/rtpsession.c
+++ b/modules/demux/rtpsession.c
@@ -366,7 +366,7 @@ rtp_decode (demux_t *demux, const rtp_session_t *session, rtp_source_t *src)
     /* FIXME: handle timestamp wrap properly */
     /* TODO: sync multiple sources sanely... */
     const uint32_t timestamp = GetDWBE (block->p_buffer + 4);
-    block->i_pts = CLOCK_FREQ * timestamp / pt->frequency;
+    block->i_pts = UINT64_C(1) * CLOCK_FREQ * timestamp / pt->frequency;
 
     /* CSRC count */
     size_t skip = 12u + (block->p_buffer[0] & 0x0F) * 4;