vlc/vlc-2.0 | branch: master | F. Yhuel <[email protected]> | Sun Mar 18 18:22:12 2012 +0100| [b1f63c28dd56c29d2db5df6f02f4b28ac4a39ff4] | committer: Jean-Baptiste Kempf
libmp4: fix 'mfhd' parsing Signed-off-by: Jean-Baptiste Kempf <[email protected]> (cherry picked from commit 0b1b7516b965fa87c295eb0e7b9aa249f917e4e7) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=b1f63c28dd56c29d2db5df6f02f4b28ac4a39ff4 --- modules/demux/mp4/libmp4.c | 2 ++ modules/demux/mp4/libmp4.h | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c index 5f31c19..50f1a58 100644 --- a/modules/demux/mp4/libmp4.c +++ b/modules/demux/mp4/libmp4.c @@ -483,6 +483,8 @@ static int MP4_ReadBox_mfhd( stream_t *p_stream, MP4_Box_t *p_box ) { MP4_READBOX_ENTER( MP4_Box_data_mfhd_t ); + MP4_GETVERSIONFLAGS( p_box->data.p_mvhd ); + MP4_GET4BYTES( p_box->data.p_mfhd->i_sequence_number ); #ifdef MP4_VERBOSE diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h index aa016fe..1ffa90d 100644 --- a/modules/demux/mp4/libmp4.h +++ b/modules/demux/mp4/libmp4.h @@ -828,9 +828,10 @@ typedef struct typedef struct MP4_Box_data_mfhd_s { - uint32_t i_sequence_number; + uint8_t i_version; + uint32_t i_flags; - uint8_t *p_vendor_extension; + uint32_t i_sequence_number; } MP4_Box_data_mfhd_t; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
