Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
14
Merge Requests
14
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
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
Steve Lhomme
VLC
Commits
2b48bf55
Commit
2b48bf55
authored
Apr 29, 2017
by
François Cartegnie
🤞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: mp4: force track timescale to nonzero
parent
558d1a74
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+3
-3
No files found.
modules/demux/mp4/mp4.c
View file @
2b48bf55
...
...
@@ -3053,13 +3053,12 @@ static void MP4_TrackSetup( demux_t *p_demux, mp4_track_t *p_track,
return
;
}
p_track
->
i_timescale
=
BOXDATA
(
p_mdhd
)
->
i_timescale
;
if
(
p_track
->
i_timescale
==
0
)
if
(
BOXDATA
(
p_mdhd
)
->
i_timescale
==
0
)
{
p_track
->
i_timescale
=
p_sys
->
i_timescale
;
msg_Warn
(
p_demux
,
"Invalid track timescale "
);
return
;
}
p_track
->
i_timescale
=
BOXDATA
(
p_mdhd
)
->
i_timescale
;
memcpy
(
&
language
,
BOXDATA
(
p_mdhd
)
->
rgs_language
,
3
);
p_track
->
b_mac_encoding
=
BOXDATA
(
p_mdhd
)
->
b_mac_encoding
;
...
...
@@ -3326,6 +3325,7 @@ static void MP4_TrackInit( mp4_track_t *p_track )
{
memset
(
p_track
,
0
,
sizeof
(
mp4_track_t
)
);
es_format_Init
(
&
p_track
->
fmt
,
0
,
0
);
p_track
->
i_timescale
=
1
;
}
static
void
MP4_TrackSelect
(
demux_t
*
p_demux
,
mp4_track_t
*
p_track
,
bool
b_select
)
...
...
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