. suppression d'un bug cosm�tique dans l'affichage des plugins qui en

[vlc] / include / video_output.h

diff --git a/include/video_output.h b/include/video_output.h
index e61ae7c6eff8173429803dd495c77cce586f669b..80fb7f82a686713fd236d89f6703e276b821345a 100644 (file)
--- a/include/video_output.h
+++ b/include/video_output.h
@@ -12,16 +12,15 @@
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- *
+ * 
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -57,7 +56,7 @@ typedef struct vout_yuv_s
     vout_yuv_convert_t *        p_Convert422;         /* YUV 4:2:2 converter */
     vout_yuv_convert_t *        p_Convert444;         /* YUV 4:4:4 converter */
 
-    /* Pre-calculated convertion tables */
+    /* Pre-calculated conversion tables */
     void *              p_base;            /* base for all conversion tables */
     union
     {
@@ -69,7 +68,7 @@ typedef struct vout_yuv_s
         u32 *           p_rgb32;                        /* RGB 32 bits table */
     } yuv;
 
-    /* Temporary convertion buffer and offset array */
+    /* Temporary conversion buffer and offset array */
     void *              p_buffer;                       /* convertion buffer */
     int *               p_offset;                            /* offset array */
 } vout_yuv_t;
@@ -103,7 +102,8 @@ typedef struct vout_buffer_s
  * structure.
  *****************************************************************************/
 typedef int  (vout_sys_create_t)    ( p_vout_thread_t p_vout,
-                                      char *psz_display, int i_root_window );
+                                      char *psz_display,
+                                      int i_root_window, void *p_data );
 typedef int  (vout_sys_init_t)      ( p_vout_thread_t p_vout );
 typedef void (vout_sys_end_t)       ( p_vout_thread_t p_vout );
 typedef void (vout_sys_destroy_t)   ( p_vout_thread_t p_vout );
@@ -152,7 +152,7 @@ typedef struct vout_thread_s
     u32                 i_blue_pixel;                                /* blue */
 
     /* Plugins */
-    void *                  p_vout_plugin;            /* video output plugin */
+    plugin_id_t             vout_plugin;              /* video output plugin */
     vout_sys_create_t *     p_sys_create;          /* allocate output method */
     vout_sys_init_t *       p_sys_init;          /* initialize output method */
     vout_sys_end_t *        p_sys_end;            /* terminate output method */
@@ -225,7 +225,8 @@ typedef struct vout_thread_s
  * Prototypes
  *****************************************************************************/
 vout_thread_t * vout_CreateThread       ( char *psz_display, int i_root_window,
-                                          int i_width, int i_height, int *pi_status, int i_method );
+                                          int i_width, int i_height, int *pi_status,
+                                          int i_method, void *p_data );
 void            vout_DestroyThread      ( vout_thread_t *p_vout, int *pi_status );
 picture_t *     vout_CreatePicture      ( vout_thread_t *p_vout, int i_type,
                                           int i_width, int i_height );