[vlc-commits] demux: mp4: timescales are u32

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue May 20 19:32:56 2014 +0200| [7905fe6a0f6a1a64be9bc5fc027b5c63eef106f9] | committer: Francois Cartegnie

demux: mp4: timescales are u32

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

 modules/demux/mp4/libmp4.h |    2 +-
 modules/demux/mp4/mp4.c    |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index 59b57e9..d071697 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -1339,7 +1339,7 @@ typedef struct
     float f_rotation;
 
     /* more internal data */
-    uint64_t        i_timescale;    /* time scale for this track only */
+    uint32_t        i_timescale;    /* time scale for this track only */
     uint16_t        current_qid;    /* Smooth Streaming quality level ID */
 
     /* elst */
diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 8f72ca2..f30d2b3 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -72,7 +72,7 @@ struct demux_sys_t
 
     uint64_t     i_time;         /* time position of the presentation
                                   * in movie timescale */
-    uint64_t     i_timescale;    /* movie time scale */
+    uint32_t     i_timescale;    /* movie time scale */
     uint64_t     i_duration;     /* movie duration */
     unsigned int i_tracks;       /* number of tracks */
     mp4_track_t  *track;         /* array of track */
@@ -2086,7 +2086,7 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
                 MP4_Box_data_sample_soun_t *p_soun =
                     p_sample->data.p_sample_soun;
 
-                msg_Warn( p_demux, "i_timescale (%"PRIu64") != i_sampleratehi "
+                msg_Warn( p_demux, "i_timescale (%"PRId32") != i_sampleratehi "
                           "(%u), making both equal (report any problem).",
                           p_track->i_timescale, p_soun->i_sampleratehi );