[vlc-commits] mkv: prepare for void *p_sys

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Dec  3 17:05:50 2017 +0200| [8e2e0572fb806d3391b7d8ff57e9a48c8627de89] | committer: Rémi Denis-Courmont

mkv: prepare for void *p_sys

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8e2e0572fb806d3391b7d8ff57e9a48c8627de89
---

 modules/demux/mkv/demux.cpp           |  2 +-
 modules/demux/mkv/mkv.cpp             | 10 +++++-----
 modules/demux/mkv/util.cpp            |  2 +-
 modules/demux/mkv/virtual_segment.cpp |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp
index 97be3fde04..42994af6fb 100644
--- a/modules/demux/mkv/demux.cpp
+++ b/modules/demux/mkv/demux.cpp
@@ -135,7 +135,7 @@ int event_thread_t::EventInput( vlc_object_t *p_this, char const *,
 
 void event_thread_t::EventThread()
 {
-    demux_sys_t    *p_sys = p_demux->p_sys;
+    demux_sys_t *p_sys = (demux_sys_t *)p_demux->p_sys;
     vlc_object_t   *p_vout = NULL;
     int canc = vlc_savecancel ();
 
diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index 95d4308ab3..a8019f399c 100644
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -274,7 +274,7 @@ error:
 static void Close( vlc_object_t *p_this )
 {
     demux_t     *p_demux = reinterpret_cast<demux_t*>( p_this );
-    demux_sys_t *p_sys   = p_demux->p_sys;
+    demux_sys_t *p_sys = (demux_sys_t *)p_demux->p_sys;
     virtual_segment_c *p_vsegment = p_sys->p_current_vsegment;
     if( p_vsegment )
     {
@@ -291,7 +291,7 @@ static void Close( vlc_object_t *p_this )
  *****************************************************************************/
 static int Control( demux_t *p_demux, int i_query, va_list args )
 {
-    demux_sys_t        *p_sys = p_demux->p_sys;
+    demux_sys_t *p_sys = (demux_sys_t *)p_demux->p_sys;
     int64_t     *pi64, i64;
     double      *pf, f;
     int         i_skp;
@@ -464,7 +464,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 /* Seek */
 static int Seek( demux_t *p_demux, mtime_t i_mk_date, double f_percent, virtual_chapter_c *p_vchapter, bool b_precise )
 {
-    demux_sys_t        *p_sys = p_demux->p_sys;
+    demux_sys_t *p_sys = (demux_sys_t *)p_demux->p_sys;
     virtual_segment_c  *p_vsegment = p_sys->p_current_vsegment;
     matroska_segment_c *p_segment = p_vsegment->CurrentSegment();
 
@@ -505,7 +505,7 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
                   mtime_t i_pts, mtime_t i_duration, bool b_key_picture,
                   bool b_discardable_picture )
 {
-    demux_sys_t        *p_sys = p_demux->p_sys;
+    demux_sys_t *p_sys = (demux_sys_t *)p_demux->p_sys;
     matroska_segment_c *p_segment = p_sys->p_current_vsegment->CurrentSegment();
 
     if( !p_segment ) return;
@@ -690,7 +690,7 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
  *****************************************************************************/
 static int Demux( demux_t *p_demux)
 {
-    demux_sys_t        *p_sys = p_demux->p_sys;
+    demux_sys_t *p_sys = (demux_sys_t *)p_demux->p_sys;
 
     vlc_mutex_locker demux_lock ( &p_sys->lock_demuxer );
 
diff --git a/modules/demux/mkv/util.cpp b/modules/demux/mkv/util.cpp
index b5ea09a79d..386cb9b0a0 100644
--- a/modules/demux/mkv/util.cpp
+++ b/modules/demux/mkv/util.cpp
@@ -239,7 +239,7 @@ void handle_real_audio(demux_t * p_demux, mkv_track_t * p_tk, block_t * p_blk, m
 
 void send_Block( demux_t * p_demux, mkv_track_t * p_tk, block_t * p_block, unsigned int i_number_frames, mtime_t i_duration )
 {
-    demux_sys_t        *p_sys = p_demux->p_sys;
+    demux_sys_t *p_sys = (demux_sys_t *)p_demux->p_sys;
     matroska_segment_c *p_segment = p_sys->p_current_vsegment->CurrentSegment();
 
     if( p_tk->fmt.i_cat == AUDIO_ES && p_tk->i_chans_to_reorder )
diff --git a/modules/demux/mkv/virtual_segment.cpp b/modules/demux/mkv/virtual_segment.cpp
index eea846ffd5..9c1a03d646 100644
--- a/modules/demux/mkv/virtual_segment.cpp
+++ b/modules/demux/mkv/virtual_segment.cpp
@@ -424,7 +424,7 @@ virtual_chapter_c* virtual_edition_c::getChapterbyTimecode( int64_t time )
 
 bool virtual_segment_c::UpdateCurrentToChapter( demux_t & demux )
 {
-    demux_sys_t & sys = *demux.p_sys;
+    demux_sys_t & sys = *(demux_sys_t *)demux.p_sys;
     virtual_chapter_c *p_cur_vchapter = NULL;
     virtual_edition_c *p_cur_vedition = veditions[ i_current_edition ];
 
@@ -516,7 +516,7 @@ bool virtual_chapter_c::EnterAndLeave( virtual_chapter_c *p_leaving_vchapter, bo
 bool virtual_segment_c::Seek( demux_t & demuxer, mtime_t i_mk_date,
                               virtual_chapter_c *p_vchapter, bool b_precise )
 {
-    demux_sys_t *p_sys = demuxer.p_sys;
+    demux_sys_t *p_sys = (demux_sys_t *)demuxer.p_sys;
 
 
     /* find the actual time for an ordered edition */