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
3ff38b86
Commit
3ff38b86
authored
May 27, 2014
by
François Cartegnie
🤞
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: mp4: fix TRUN composition time signedness
parent
105797f1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
modules/demux/mp4/libmp4.h
modules/demux/mp4/libmp4.h
+1
-1
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+4
-2
No files found.
modules/demux/mp4/libmp4.h
View file @
3ff38b86
...
...
@@ -953,7 +953,7 @@ typedef struct MP4_descriptor_trun_sample_t
uint32_t
i_duration
;
uint32_t
i_size
;
uint32_t
i_flags
;
uint32_t
i_composition_time_offset
;
uint32_t
i_composition_time_offset
;
/* version == 0 ? signed : unsigned */
}
MP4_descriptor_trun_sample_t
;
typedef
struct
MP4_Box_data_trun_s
...
...
modules/demux/mp4/mp4.c
View file @
3ff38b86
...
...
@@ -3933,8 +3933,10 @@ static int MP4_frg_GetChunk( demux_t *p_demux, MP4_Box_t *p_chunk, unsigned *i_t
if
(
ret
->
p_sample_offset_pts
)
{
ret
->
p_sample_offset_pts
[
i
]
=
p_trun_data
->
p_samples
[
i
].
i_composition_time_offset
;
if
(
p_trun_data
->
i_version
==
0
)
ret
->
p_sample_offset_pts
[
i
]
=
(
int32_t
)
p_trun_data
->
p_samples
[
i
].
i_composition_time_offset
;
else
ret
->
p_sample_offset_pts
[
i
]
=
__MIN
(
INT32_MAX
,
p_trun_data
->
p_samples
[
i
].
i_composition_time_offset
);
}
if
(
p_trun_data
->
i_flags
&
MP4_TRUN_SAMPLE_SIZE
)
...
...
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