[vlc-commits] mux:mp4: mp4mux_edit_t.i_read_duration is an mtime_t

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Jun 11 17:33:13 2018 +0200| [b61526d7e78030b13ef9508c058b7164caf68b27] | committer: Steve Lhomme

mux:mp4: mp4mux_edit_t.i_read_duration is an mtime_t

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

 modules/mux/mp4/libmp4mux.c | 2 +-
 modules/mux/mp4/libmp4mux.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/mux/mp4/libmp4mux.c b/modules/mux/mp4/libmp4mux.c
index 5eba714424..7b45db12ca 100644
--- a/modules/mux/mp4/libmp4mux.c
+++ b/modules/mux/mp4/libmp4mux.c
@@ -244,7 +244,7 @@ static bo_t *GetESDS(mp4mux_trackinfo_t *p_track)
     }
 
     if (p_track->i_read_duration > 0)
-        i_bitrate_avg = INT64_C(8000000) * i_bitrate_avg / p_track->i_read_duration;
+        i_bitrate_avg = CLOCK_FREQ * 8 * i_bitrate_avg / p_track->i_read_duration;
     else
         i_bitrate_avg = 0;
     if (i_bitrate_max <= 1)
diff --git a/modules/mux/mp4/libmp4mux.h b/modules/mux/mp4/libmp4mux.h
index 792274da12..f343553665 100644
--- a/modules/mux/mp4/libmp4mux.h
+++ b/modules/mux/mp4/libmp4mux.h
@@ -55,7 +55,7 @@ typedef struct
     block_t      *a52_frame;
 
     /* stats */
-    int64_t      i_read_duration;
+    mtime_t      i_read_duration;
     uint32_t     i_timescale;
     mtime_t      i_firstdts; /* the really first packet */
     bool         b_hasbframes;