[vlc-commits] input: fix invalid title array pointer conversion

Rémi Denis-Courmont git at videolan.org
Sun Jan 27 18:02:12 CET 2019


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Jan 27 18:54:42 2019 +0200| [cafb0b8c8da26434123515ca3b98ebd59549f527] | committer: Rémi Denis-Courmont

input: fix invalid title array pointer conversion

Regression from cad5bc0a9d86797b0ea50036a6fa14e515e16e09.

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

 include/vlc_input.h        | 2 +-
 src/input/input_internal.h | 2 +-
 src/input/player.c         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 0df33d6221..d44641dae6 100644
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -421,7 +421,7 @@ struct vlc_input_event_title
     {
         struct
         {
-            const input_title_t **array;
+            input_title_t *const *array;
             size_t count;
         } list;
         size_t selected_idx;
diff --git a/src/input/input_internal.h b/src/input/input_internal.h
index 59c7b1e520..a9a949b9ac 100644
--- a/src/input/input_internal.h
+++ b/src/input/input_internal.h
@@ -154,7 +154,7 @@ typedef struct input_thread_private_t
 
     /* Title infos FIXME multi-input (not easy) ? */
     int          i_title;
-    const input_title_t **title;
+    input_title_t *const *title;
 
     int i_title_offset;
     int i_seekpoint_offset;
diff --git a/src/input/player.c b/src/input/player.c
index 4fcf851124..7fed24f184 100644
--- a/src/input/player.c
+++ b/src/input/player.c
@@ -549,7 +549,7 @@ seekpoint_GetName(seekpoint_t *seekpoint, int idx, int chapter_offset)
 }
 
 static struct vlc_player_title_list *
-vlc_player_title_list_Create(const input_title_t **array, size_t count,
+vlc_player_title_list_Create(input_title_t *const *array, size_t count,
                              int title_offset, int chapter_offset)
 {
     if (count == 0)



More information about the vlc-commits mailing list