Commit 7905fe6a authored by Francois Cartegnie's avatar Francois Cartegnie

demux: mp4: timescales are u32

parent 7ca27c5e
...@@ -1339,7 +1339,7 @@ typedef struct ...@@ -1339,7 +1339,7 @@ typedef struct
float f_rotation; float f_rotation;
/* more internal data */ /* 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 */ uint16_t current_qid; /* Smooth Streaming quality level ID */
/* elst */ /* elst */
......
...@@ -72,7 +72,7 @@ struct demux_sys_t ...@@ -72,7 +72,7 @@ struct demux_sys_t
uint64_t i_time; /* time position of the presentation uint64_t i_time; /* time position of the presentation
* in movie timescale */ * in movie timescale */
uint64_t i_timescale; /* movie time scale */ uint32_t i_timescale; /* movie time scale */
uint64_t i_duration; /* movie duration */ uint64_t i_duration; /* movie duration */
unsigned int i_tracks; /* number of tracks */ unsigned int i_tracks; /* number of tracks */
mp4_track_t *track; /* array of track */ mp4_track_t *track; /* array of track */
...@@ -2086,7 +2086,7 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_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 = MP4_Box_data_sample_soun_t *p_soun =
p_sample->data.p_sample_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).", "(%u), making both equal (report any problem).",
p_track->i_timescale, p_soun->i_sampleratehi ); p_track->i_timescale, p_soun->i_sampleratehi );
......
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