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
15
Merge Requests
15
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
c5f14ee5
Commit
c5f14ee5
authored
Apr 29, 2017
by
François Cartegnie
🤞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: mp4: early reject invalid timescale
parent
bd5e93e1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+2
-2
No files found.
modules/demux/mp4/mp4.c
View file @
c5f14ee5
...
...
@@ -771,7 +771,7 @@ static int Open( vlc_object_t * p_this )
}
p_mvhd
=
MP4_BoxGet
(
p_sys
->
p_moov
,
"mvhd"
);
if
(
p_mvhd
&&
BOXDATA
(
p_mvhd
)
)
if
(
p_mvhd
&&
BOXDATA
(
p_mvhd
)
&&
BOXDATA
(
p_mvhd
)
->
i_timescale
)
{
p_sys
->
i_timescale
=
BOXDATA
(
p_mvhd
)
->
i_timescale
;
p_sys
->
i_moov_duration
=
p_sys
->
i_duration
=
BOXDATA
(
p_mvhd
)
->
i_duration
;
...
...
@@ -779,8 +779,8 @@ static int Open( vlc_object_t * p_this )
}
else
{
p_sys
->
i_timescale
=
CLOCK_FREQ
;
msg_Warn
(
p_demux
,
"No valid mvhd found"
);
goto
error
;
}
if
(
(
p_rmra
=
MP4_BoxGet
(
p_sys
->
p_root
,
"/moov/rmra"
)
)
)
...
...
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