Only input uses b_dead

diff --git a/include/vlc_common.h b/include/vlc_common.h
index 3190e669db5c6d907ab653290bac12fd1f4d02d6..1c2e80684b157d13a78faadc9f09c1a45e318573 100644 (file)
--- a/include/vlc_common.h
+++ b/include/vlc_common.h
@@ -537,7 +537,6 @@ typedef struct vlc_object_internals_t vlc_object_internals_t;
     /* Object properties */                                                 \
     volatile bool b_error;                  /**< set by the object */ \
     volatile bool b_die;                   /**< set by the outside */ \
-    volatile bool b_dead;                   /**< set by the object */ \
     bool b_force;      /**< set by the outside (eg. module_Need()) */ \
                                                                             \
     /* Stuff related to the libvlc structure */                             \

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 63debca1f06544234842a27b8cb80ab2686bc091..6eeeb0555eda4bc8b5b76fc561c2fab5c70422d8 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -439,8 +439,9 @@ struct input_thread_t
 {
     VLC_COMMON_MEMBERS;
 
-    bool  b_eof;
+    bool b_eof;
     bool b_preparsing;
+    bool b_dead;
 
     int i_state;
     bool b_can_pace_control;

diff --git a/src/misc/objects.c b/src/misc/objects.c
index bfd2061e897e701a4f45e38b0834d81da0eb9604..b6fc4ff813fd7af5e681800f1df3640c62a5bc98 100644 (file)
--- a/src/misc/objects.c
+++ b/src/misc/objects.c
@@ -126,7 +126,6 @@ void *__vlc_custom_create( vlc_object_t *p_this, size_t i_size,
 
     p_new->b_die = false;
     p_new->b_error = false;
-    p_new->b_dead = false;
     p_new->b_force = false;
 
     p_new->psz_header = NULL;