input: fix warnings

src/input/es_out.c

@@ -388,7 +388,7 @@ decoder_on_vout_stopped(vlc_input_decoder_t *decoder, vout_thread_t *vout, void
 
 static void
 decoder_on_captions_to_display(vlc_input_decoder_t *decoder, vout_thread_t *vout,
-                               void *p_cc, size_t i_cc, void *userdata)
+                               const void *p_cc, size_t i_cc, void *userdata)
 {
     (void)decoder;
     es_out_id_t *id = userdata;
@@ -426,7 +426,7 @@ decoder_on_vout_frame_displayed(vlc_input_decoder_t *decoder, vout_thread_t *vou
         .type = INPUT_EVENT_VOUT_FRAME_DISPLAYED,
         .vout_frame = {
             .vout = vout,
-            .id = id,
+            .id = &id->id,
             .pts = pts,
         },
     };
@@ -600,8 +600,8 @@ static const struct vlc_input_decoder_callbacks decoder_cbs = {
     .on_new_video_stats = decoder_on_new_video_stats,
     .on_new_video_sk_stats = decoder_on_new_video_sk_stats,
     .on_new_audio_stats = decoder_on_new_audio_stats,
-    .get_attachments = decoder_get_attachments,
     .on_new_decoder_stats = decoder_on_new_decoder_stats,
+    .get_attachments = decoder_get_attachments,
 };
 
 /*****************************************************************************

src/input/input_internal.h

@@ -271,14 +271,14 @@ struct vlc_input_event_vout
 struct vlc_input_event_vout_frame_displayed
 {
     vout_thread_t *vout;
-    struct vlc_es_out_id_t *id;
+    vlc_es_id_t *id;
     vlc_tick_t pts;
 };
 
 struct vlc_input_event_captions
 {
     vout_thread_t *vout;
-    void *p_cc;
+    const void *p_cc;
     size_t i_cc;
 };
 

src/player/input.c

@@ -870,7 +870,7 @@ input_thread_Events(input_thread_t *input_thread,
             assert(track);
 
             vlc_player_vout_SendEvent(player, on_frame_displayed,
-                event->vout_frame.vout, track,
+                event->vout_frame.vout, &track->t,
                 event->vout_frame.pts);
             break;
         }