AVI: fix potential crash on seek (Closes: LP#803006)

[vlc] / include / vlc_common.h

diff --git a/include/vlc_common.h b/include/vlc_common.h
index fe7d9dd829cd81b95d80670087260a1c93973bfa..cb0ce9424fcacbc59b3c8fed0acd8f4179a850c3 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -261,7 +261,7 @@ typedef struct es_format_t es_format_t;
 typedef struct video_palette_t video_palette_t;
 
 /* Audio */
-typedef struct aout_instance_t aout_instance_t;
+typedef struct audio_output audio_output_t;
 typedef struct aout_sys_t aout_sys_t;
 typedef struct aout_fifo_t aout_fifo_t;
 typedef struct aout_input_t aout_input_t;
@@ -344,10 +344,6 @@ typedef int (*httpd_handler_callback_t)( httpd_handler_sys_t *, httpd_handler_t
 typedef struct httpd_redirect_t httpd_redirect_t;
 typedef struct httpd_stream_t httpd_stream_t;
 
-/* TLS support */
-typedef struct tls_server_t tls_server_t;
-typedef struct tls_session_t tls_session_t;
-
 /* Hashing */
 typedef struct md5_s md5_t;
 
@@ -432,24 +428,6 @@ struct vlc_list_t
 
 };
 
-/**
- * \defgroup var_type Variable types
- * These are the different types a vlc variable can have.
- * @{
- */
-#define VLC_VAR_VOID      0x0010
-#define VLC_VAR_BOOL      0x0020
-#define VLC_VAR_INTEGER   0x0030
-#define VLC_VAR_HOTKEY    0x0031
-#define VLC_VAR_STRING    0x0040
-#define VLC_VAR_VARIABLE  0x0044
-#define VLC_VAR_FLOAT     0x0050
-#define VLC_VAR_TIME      0x0060
-#define VLC_VAR_ADDRESS   0x0070
-#define VLC_VAR_MUTEX     0x0080
-#define VLC_VAR_COORDS    0x00A0
-/**@}*/
-
 /*****************************************************************************
  * Error values (shouldn't be exposed)
  *****************************************************************************/
@@ -870,6 +848,14 @@ static inline void *xrealloc (void *ptr, size_t len)
     return nptr;
 }
 
+static inline void *xcalloc (size_t n, size_t size)
+{
+    void *ptr = calloc (n, size);
+    if (unlikely (ptr == NULL))
+        abort ();
+    return ptr;
+}
+
 /*****************************************************************************
  * libvlc features
  *****************************************************************************/