Merge branch 1.0-bugfix into master

Conflicts:
	modules/video_output/drawable.c
	src/control/libvlc_internal.h

diff --cc modules/codec/fluidsynth.c
Simple merge

diff --cc modules/video_output/xcb/x11.c
Simple merge

diff --cc modules/video_output/xcb/xvideo.c
Simple merge

diff --cc src/control/libvlc_internal.h
index 58d43972dc04722c489b2c20cd31e96a0533eb6d,417d38e01f11f7048b2c8e7ef50a1d05e8bf66d3..311a859cd71c0a4b44158083ab1e2c0ede829bfc
--- 1/src/control/libvlc_internal.h
--- 2/src/control/libvlc_internal.h
+++ b/src/control/libvlc_internal.h
@@@ -162,20 -161,10 +162,8 @@@ struct libvlc_media_player_
          uint32_t xid;
          uint32_t agl;
      } drawable;
 -
 -    bool        b_own_its_input_thread;
  };
  
- struct libvlc_media_list_player_t
- {
-     libvlc_event_manager_t *    p_event_manager;
-     libvlc_instance_t *         p_libvlc_instance;
-     unsigned                    i_refcount;
-     vlc_mutex_t                 object_lock;
-     libvlc_media_list_path_t    current_playing_item_path;
-     libvlc_media_t *            p_current_playing_item;
-     libvlc_media_list_t *       p_mlist;
-     libvlc_media_player_t *     p_mi;
- };
- 
  struct libvlc_media_library_t
  {
      libvlc_event_manager_t * p_event_manager;

diff --cc src/control/media_list_player.c
Simple merge