Skip to content

V
vlc
Commit 9240f975 authored by Frédéric Yhuel's avatar Frédéric Yhuel Committed by Jean-Baptiste Kempf
Browse files
Options

libmp4: 'trun' parsing: minor fixes 

Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent a50d7e47
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
modules/demux/mp4/libmp4.c
View file @ 9240f975
...@@ -650,7 +650,7 @@ static int MP4_ReadBox_trun( stream_t *p_stream, MP4_Box_t *p_box ) ...@@ -650,7 +650,7 @@ static int MP4_ReadBox_trun( stream_t *p_stream, MP4_Box_t *p_box )
} }
#ifdef MP4_VERBOSE #ifdef MP4_VERBOSE
msg_Dbg( p_stream, "read box: \"trun\" version %d flags 0x%x sample count %d", msg_Dbg( p_stream, "read box: \"trun\" version %u flags 0x%x sample count %u",
p_box->data.p_trun->i_version, p_box->data.p_trun->i_version,
p_box->data.p_trun->i_flags, p_box->data.p_trun->i_flags,
p_box->data.p_trun->i_sample_count ); p_box->data.p_trun->i_sample_count );
...@@ -658,7 +658,8 @@ static int MP4_ReadBox_trun( stream_t *p_stream, MP4_Box_t *p_box ) ...@@ -658,7 +658,8 @@ static int MP4_ReadBox_trun( stream_t *p_stream, MP4_Box_t *p_box )
for( unsigned int i = 0; i<p_box->data.p_trun->i_sample_count; i++ ) for( unsigned int i = 0; i<p_box->data.p_trun->i_sample_count; i++ )
{ {
MP4_descriptor_trun_sample_t *p_sample = &p_box->data.p_trun->p_samples[i]; MP4_descriptor_trun_sample_t *p_sample = &p_box->data.p_trun->p_samples[i];
msg_Dbg( p_stream, "read box: \"trun\" sample %4.4d flags 0x%x duration %d size %d composition time offset %d", msg_Dbg( p_stream, "read box: \"trun\" sample %4.4u flags 0x%x "\
"duration %"PRIu32" size %"PRIu32" composition time offset %"PRIu32,
i, p_sample->i_flags, p_sample->i_duration, i, p_sample->i_flags, p_sample->i_duration,
p_sample->i_size, p_sample->i_composition_time_offset ); p_sample->i_size, p_sample->i_composition_time_offset );
} }
......
modules/demux/mp4/libmp4.h
View file @ 9240f975
...@@ -935,7 +935,7 @@ typedef struct MP4_Box_data_trun_s ...@@ -935,7 +935,7 @@ typedef struct MP4_Box_data_trun_s
uint32_t i_sample_count; uint32_t i_sample_count;
/* optional fields */ /* optional fields */
uint32_t i_data_offset; int32_t i_data_offset;
uint32_t i_first_sample_flags; uint32_t i_first_sample_flags;
MP4_descriptor_trun_sample_t *p_samples; MP4_descriptor_trun_sample_t *p_samples;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment