Skip to content

V
vlc-2-2
Commit bbebf410 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

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

This reverts commit df65d657.
parent 05882af7
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
include/vlc_config.h
View file @ bbebf410
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
* General configuration * General configuration
*****************************************************************************/ *****************************************************************************/
#define CLOCK_FREQ (UINT64_C(1000000)) #define CLOCK_FREQ 1000000
/* When creating or destroying threads in blocking mode, delay to poll thread /* When creating or destroying threads in blocking mode, delay to poll thread
......
modules/demux/rtpsession.c
View file @ bbebf410
...@@ -366,7 +366,7 @@ rtp_decode (demux_t *demux, const rtp_session_t *session, rtp_source_t *src) ...@@ -366,7 +366,7 @@ rtp_decode (demux_t *demux, const rtp_session_t *session, rtp_source_t *src)
/* FIXME: handle timestamp wrap properly */ /* FIXME: handle timestamp wrap properly */
/* TODO: sync multiple sources sanely... */ /* TODO: sync multiple sources sanely... */
const uint32_t timestamp = GetDWBE (block->p_buffer + 4); 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 */ /* CSRC count */
size_t skip = 12u + (block->p_buffer[0] & 0x0F) * 4; size_t skip = 12u + (block->p_buffer[0] & 0x0F) * 4;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment