Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Steve Lhomme
VLC
Commits
eceac9eb
Commit
eceac9eb
authored
Apr 30, 2015
by
François Cartegnie
🤞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: mp4: fix NULL dereference handling trun
parent
566a0746
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
6 deletions
+9
-6
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+9
-6
No files found.
modules/demux/mp4/mp4.c
View file @
eceac9eb
...
...
@@ -4562,14 +4562,17 @@ static int LeafParseTRUN( demux_t *p_demux, mp4_track_t *p_track,
es_out_Control
(
p_demux
->
out
,
ES_OUT_SET_PCR
,
VLC_TS_0
+
i_nzdts
);
}
if
(
p_
track
->
p_es
)
if
(
p_
block
)
{
p_block
->
i_dts
=
VLC_TS_0
+
i_nzdts
;
p_block
->
i_pts
=
VLC_TS_0
+
i_nzpts
;
p_block
->
i_length
=
CLOCK_FREQ
*
dur
/
p_track
->
i_timescale
;
MP4_Block_Send
(
p_demux
,
p_track
,
p_block
);
if
(
p_track
->
p_es
)
{
p_block
->
i_dts
=
VLC_TS_0
+
i_nzdts
;
p_block
->
i_pts
=
VLC_TS_0
+
i_nzpts
;
p_block
->
i_length
=
CLOCK_FREQ
*
dur
/
p_track
->
i_timescale
;
MP4_Block_Send
(
p_demux
,
p_track
,
p_block
);
}
else
block_Release
(
p_block
);
}
else
free
(
p_block
);
chunk_size
+=
len
;
}
...
...
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