[vlc-devel] [PATCH 01/17] es_out_timeshift: add int_i64_i64 control

[Thomas Guillem]

Will be used to hold the matching time sent via PCR controls.
---
 src/input/es_out_timeshift.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index 3239e8e9c2e..573a0fd8e86 100644
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -113,8 +113,9 @@ typedef struct attribute_packed
         struct
         {
             int     i_int;
-            int64_t i_i64;
-        } int_i64;
+            int64_t i_i64_1;
+            int64_t i_i64_2;
+        } int_i64_i64;
         struct
         {
             int        i_int;
@@ -1532,8 +1533,8 @@ static int CmdInitControl( ts_cmd_control_t *p_cmd, input_source_t *in,
         break;
 
     case ES_OUT_SET_GROUP_PCR:          /* arg1= int i_group, arg2=vlc_tick_t i_pcr(microsecond!)*/
-        p_cmd->u.int_i64.i_int = va_arg( args, int );
-        p_cmd->u.int_i64.i_i64 = va_arg( args, vlc_tick_t );
+        p_cmd->u.int_i64_i64.i_int = va_arg( args, int );
+        p_cmd->u.int_i64_i64.i_i64_1 = va_arg( args, vlc_tick_t );
         break;
 
     case ES_OUT_SET_ES_SCRAMBLED_STATE:
@@ -1667,8 +1668,8 @@ static int CmdExecuteControl( es_out_t *p_tsout, ts_cmd_control_t *p_cmd )
         return es_out_in_Control( p_sys->p_out, in, i_query, p_cmd->u.i_i64 );
 
     case ES_OUT_SET_GROUP_PCR:          /* arg1= int i_group, arg2=vlc_tick_t i_pcr(microsecond!)*/
-        return es_out_in_Control( p_sys->p_out, in, i_query, p_cmd->u.int_i64.i_int,
-                                  p_cmd->u.int_i64.i_i64 );
+        return es_out_in_Control( p_sys->p_out, in, i_query, p_cmd->u.int_i64_i64.i_int,
+                                  p_cmd->u.int_i64_i64.i_i64_1 );
 
     case ES_OUT_RESET_PCR:           /* no arg */
         return es_out_in_Control( p_sys->p_out, in, i_query );
-- 
2.30.0