From: Rémi Denis-Courmont <remi@remlab.net>
Date: Sat, 23 May 2009 14:01:32 +0000 (+0300)
Subject: Merge branch 1.0-bugfix into master
X-Git-Tag: 1.1.0-ff~5810
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=152b1687c0ec112f3ab1360006d048d6b9cf7258;p=vlc

Merge branch 1.0-bugfix into master

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

152b1687c0ec112f3ab1360006d048d6b9cf7258
diff --cc src/control/libvlc_internal.h
index 58d43972dc,417d38e01f..311a859cd7
--- a/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;