vlc | branch: master | Steve Lhomme <[email protected]> | Thu Jun 7 11:31:58 2018 +0200| [96d5784c855aa3ab52446453472d9654c0086c84] | committer: Steve Lhomme
demux:asf: the preroll start is in mtime_t > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=96d5784c855aa3ab52446453472d9654c0086c84 --- modules/demux/asf/asfpacket.h | 2 +- modules/demux/mp4/mp4.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/demux/asf/asfpacket.h b/modules/demux/asf/asfpacket.h index 768ca22f0c..445e34bfb5 100644 --- a/modules/demux/asf/asfpacket.h +++ b/modules/demux/asf/asfpacket.h @@ -44,7 +44,7 @@ struct asf_packet_sys_s /* global stream info */ uint64_t *pi_preroll; - int64_t *pi_preroll_start; + mtime_t *pi_preroll_start; /* callbacks */ void (*pf_send)(asf_packet_sys_t *, uint8_t, block_t **); diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c index faefa1ce2d..fd181f3332 100644 --- a/modules/demux/mp4/mp4.c +++ b/modules/demux/mp4/mp4.c @@ -133,7 +133,7 @@ typedef struct /* ASF in MP4 */ asf_packet_sys_t asfpacketsys; uint64_t i_preroll; /* foobar */ - int64_t i_preroll_start; + mtime_t i_preroll_start; struct { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
