[vlc-commits] stream: make STREAM_SET_PRIVATE_ID_CA parameter void *

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun May 13 22:53:23 2018 +0300| [033d2eba896522884d7b38d3729178caa15bcd54] | committer: Rémi Denis-Courmont

stream: make STREAM_SET_PRIVATE_ID_CA parameter void *

This avoids having to define the pointer type middle points.

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

 include/vlc_stream.h        | 2 +-
 modules/access/dtv/access.c | 2 +-
 modules/demux/mpeg/ts_psi.c | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/include/vlc_stream.h b/include/vlc_stream.h
index 8df71f42aa..b66f15966c 100644
--- a/include/vlc_stream.h
+++ b/include/vlc_stream.h
@@ -180,7 +180,7 @@ enum stream_query_e
     STREAM_SET_RECORD_STATE,     /**< arg1=bool, arg2=const char *psz_ext (if arg1 is true)  res=can fail */
 
     STREAM_SET_PRIVATE_ID_STATE = 0x1000, /* arg1= int i_private_data, bool b_selected    res=can fail */
-    STREAM_SET_PRIVATE_ID_CA,             /* arg1= int i_program_number, uint16_t i_vpid, uint16_t i_apid1, uint16_t i_apid2, uint16_t i_apid3, uint8_t i_length, uint8_t *p_data */
+    STREAM_SET_PRIVATE_ID_CA,             /* arg1= void * */
     STREAM_GET_PRIVATE_ID_STATE,          /* arg1=int i_private_data arg2=bool *          res=can fail */
 };
 
diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c
index 333d9b0997..4af7392526 100644
--- a/modules/access/dtv/access.c
+++ b/modules/access/dtv/access.c
@@ -578,7 +578,7 @@ static int Control (stream_t *access, int query, va_list args)
 
         case STREAM_SET_PRIVATE_ID_CA:
         {
-            en50221_capmt_info_t *pmt = va_arg (args, en50221_capmt_info_t *);
+            en50221_capmt_info_t *pmt = va_arg(args, void *);
 
             if( !dvb_set_ca_pmt (dev, pmt) )
                 return VLC_EGENERIC;
diff --git a/modules/demux/mpeg/ts_psi.c b/modules/demux/mpeg/ts_psi.c
index c277a08154..0464454a61 100644
--- a/modules/demux/mpeg/ts_psi.c
+++ b/modules/demux/mpeg/ts_psi.c
@@ -1917,7 +1917,8 @@ static void PMTCallBack( void *data, dvbpsi_pmt_t *p_dvbpsipmt )
         if( p_en )
         {
             /* DTV/CAM takes ownership of en50221_capmt_info_t on success */
-            if( vlc_stream_Control( p_sys->stream, STREAM_SET_PRIVATE_ID_CA, p_en ) != VLC_SUCCESS )
+            if( vlc_stream_Control( p_sys->stream, STREAM_SET_PRIVATE_ID_CA,
+                                    (void *)p_en ) != VLC_SUCCESS )
             {
                 en50221_capmt_Delete( p_en );
                 if ( p_sys->standard == TS_STANDARD_ARIB && !p_sys->arib.b25stream )