Fix libvlc private data alignment (untested)

diff --git a/src/libvlc.c b/src/libvlc.c
index 8c1f90717897ee8922d003fb1a4c18ddb5646539..9673a5c3583b826bc9420f34e59273b9c29a9591 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -195,8 +195,7 @@ libvlc_int_t * libvlc_InternalCreate( void )
     }
 
     /* Allocate a libvlc instance object */
-    p_libvlc = vlc_custom_create( VLC_OBJECT(p_libvlc_global),
-                                  sizeof (*p_libvlc) + sizeof (libvlc_priv_t),
+    p_libvlc = vlc_custom_create( VLC_OBJECT(p_libvlc_global), sizeof (*priv),
                                   VLC_OBJECT_LIBVLC, "libvlc" );
     if( p_libvlc != NULL )
         i_instances++;

diff --git a/src/libvlc.h b/src/libvlc.h
index 94e2a6919b031b7d243746f6ac3365361f36db7a..e9ec933cd8223153bf83ba1aab817afecb22633a 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -222,6 +222,8 @@ vlc_object_signal_maybe (vlc_object_t *p_this)
  */
 typedef struct libvlc_priv_t
 {
+    libvlc_int_t       public_data;
+
     /* Configuration */
     vlc_mutex_t        config_lock; ///< config file lock
     char *             psz_configfile;   ///< location of config file
@@ -263,7 +265,7 @@ typedef struct libvlc_priv_t
 
 static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc)
 {
-    return (libvlc_priv_t *)(libvlc + 1);
+    return (libvlc_priv_t *)libvlc;
 }
 
 void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist );