[vlc-commits] demux: avformat: use CLOCK_FREQ

Tristan Matthews git at videolan.org
Fri Jan 10 15:12:50 CET 2014


vlc | branch: master | Tristan Matthews <le.businessman at gmail.com> | Fri Jan 10 09:11:29 2014 -0500| [4e963fac6c0f6ca678288dd4a97d9e292dc1e7f0] | committer: Tristan Matthews

demux: avformat: use CLOCK_FREQ

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

 modules/demux/avformat/mux.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/avformat/mux.c b/modules/demux/avformat/mux.c
index f451eae..54aaded 100644
--- a/modules/demux/avformat/mux.c
+++ b/modules/demux/avformat/mux.c
@@ -291,14 +291,14 @@ static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
 
     if( p_data->i_pts > 0 )
         pkt.pts = p_data->i_pts * p_stream->time_base.den /
-            INT64_C(1000000) / p_stream->time_base.num;
+            CLOCK_FREQ / p_stream->time_base.num;
     if( p_data->i_dts > 0 )
         pkt.dts = p_data->i_dts * p_stream->time_base.den /
-            INT64_C(1000000) / p_stream->time_base.num;
+            CLOCK_FREQ / p_stream->time_base.num;
 
     /* this is another hack to prevent libavformat from triggering the "non monotone timestamps" check in avformat/utils.c */
     p_stream->cur_dts = ( p_data->i_dts * p_stream->time_base.den /
-            INT64_C(1000000) / p_stream->time_base.num ) - 1;
+            CLOCK_FREQ / p_stream->time_base.num ) - 1;
 
     if( av_write_frame( p_sys->oc, &pkt ) < 0 )
     {



More information about the vlc-commits mailing list