[vlc-commits] [Git][videolan/vlc][master] 4 commits: demux: mp4: remove unused members
Steve Lhomme (@robUx4)
gitlab at videolan.org
Fri Feb 3 17:42:14 UTC 2023
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
2c497c67 by Francois Cartegnie at 2023-02-03T17:28:44+00:00
demux: mp4: remove unused members
- - - - -
80c5029f by Francois Cartegnie at 2023-02-03T17:28:44+00:00
demux: mp4: fix debug
- - - - -
159ec272 by Francois Cartegnie at 2023-02-03T17:28:44+00:00
demux: mp4: remove useless code
- - - - -
39a634b6 by Francois Cartegnie at 2023-02-03T17:28:44+00:00
demux: libmp4: use vlc_assert_unreachable
- - - - -
3 changed files:
- modules/demux/mp4/libmp4.c
- modules/demux/mp4/mp4.c
- modules/demux/mp4/mp4.h
Changes:
=====================================
modules/demux/mp4/libmp4.c
=====================================
@@ -2268,8 +2268,6 @@ static int MP4_ReadBox_sgpd( stream_t *p_stream, MP4_Box_t *p_box )
if( i_read < 1 )
{
free( p_sgpd->p_entries );
- p_sgpd->i_entry_count = 0;
- p_sgpd->p_entries = NULL;
MP4_READBOX_EXIT( 0 );
}
uint8_t i_data;
@@ -2280,7 +2278,9 @@ static int MP4_ReadBox_sgpd( stream_t *p_stream, MP4_Box_t *p_box )
break;
default:
- assert(0);
+ vlc_assert_unreachable();
+ free( p_sgpd->p_entries );
+ MP4_READBOX_EXIT( 0 );
}
}
=====================================
modules/demux/mp4/mp4.c
=====================================
@@ -1463,7 +1463,7 @@ static int DemuxTrack( demux_t *p_demux, mp4_track_t *tk, uint64_t i_readpos,
#if 0
msg_Dbg( p_demux, "tk(%i)=%"PRId64" mv=%"PRId64" pos=%"PRIu64, tk->i_track_ID,
- MP4_TrackGetDTS( p_demux, tk ),
+ MP4_TrackGetDTSPTS( p_demux, tk, NULL ),
MP4_GetMoviePTS( p_demux->p_sys ), i_readpos );
#endif
=====================================
modules/demux/mp4/mp4.h
=====================================
@@ -149,11 +149,6 @@ typedef struct
uint32_t *p_sample_size; /* XXX perhaps add file offset if take
// too much time to do sumations each time*/
- uint32_t i_sample_first; /* i_sample_first value
- of the next chunk */
- uint64_t i_first_dts; /* i_first_dts value
- of the next chunk */
-
const MP4_Box_t *p_track;
const MP4_Box_t *p_stbl; /* will contain all timing information */
const MP4_Box_t *p_stsd; /* will contain all data to initialize decoder */
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/45ee01f158e92b28e4d2843b3337a09984637fd0...39a634b6ed021a24d4c774b416cd48d6bfa8aa7e
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/45ee01f158e92b28e4d2843b3337a09984637fd0...39a634b6ed021a24d4c774b416cd48d6bfa8aa7e
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list