Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
7905fe6a
Commit
7905fe6a
authored
May 20, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: mp4: timescales are u32
parent
7ca27c5e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
modules/demux/mp4/libmp4.h
modules/demux/mp4/libmp4.h
+1
-1
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+2
-2
No files found.
modules/demux/mp4/libmp4.h
View file @
7905fe6a
...
...
@@ -1339,7 +1339,7 @@ typedef struct
float
f_rotation
;
/* more internal data */
uint
64
_t
i_timescale
;
/* time scale for this track only */
uint
32
_t
i_timescale
;
/* time scale for this track only */
uint16_t
current_qid
;
/* Smooth Streaming quality level ID */
/* elst */
...
...
modules/demux/mp4/mp4.c
View file @
7905fe6a
...
...
@@ -72,7 +72,7 @@ struct demux_sys_t
uint64_t
i_time
;
/* time position of the presentation
* in movie timescale */
uint
64
_t
i_timescale
;
/* movie time scale */
uint
32
_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 (%"
PRI
u64
") != i_sampleratehi "
msg_Warn
(
p_demux
,
"i_timescale (%"
PRI
d32
") != i_sampleratehi "
"(%u), making both equal (report any problem)."
,
p_track
->
i_timescale
,
p_soun
->
i_sampleratehi
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment