Commit 033d2eba authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

stream: make STREAM_SET_PRIVATE_ID_CA parameter void *

This avoids having to define the pointer type middle points.
parent 633ed9b7
......@@ -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 */
};
......
......@@ -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;
......
......@@ -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 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment