. changed subtitles palette.

[vlc] / include / video_output.h

diff --git a/include/video_output.h b/include/video_output.h
index 6f5c41bebe3cc32d91a8582fef4621f72c973e3f..828ad6311b634ee13e09fccb0ebfb80e6b1930dc 100644 (file)
--- a/include/video_output.h
+++ b/include/video_output.h
@@ -117,10 +117,6 @@ typedef int  (yuv_sys_init_t)       ( p_vout_thread_t p_vout );
 typedef int  (yuv_sys_reset_t)      ( p_vout_thread_t p_vout );
 typedef void (yuv_sys_end_t)        ( p_vout_thread_t p_vout );
 
-struct macroblock_s;
-typedef void (vdec_DecodeMacroblock_t) ( struct vdec_thread_s *p_vdec,
-                                         struct macroblock_s *p_mb );
-
 typedef struct vout_thread_s
 {
     /* Thread properties and lock */
@@ -133,8 +129,6 @@ typedef struct vout_thread_s
     vlc_mutex_t         change_lock;                   /* thread change lock */
     int *               pi_status;                  /* temporary status flag */
     p_vout_sys_t        p_sys;                       /* system output method */
-    vdec_DecodeMacroblock_t *
-                        vdec_DecodeMacroblock;    /* decoder function to use */
                                                                    
     /* Current display properties */
     u16                 i_changes;             /* changes made to the thread */
@@ -144,6 +138,8 @@ typedef struct vout_thread_s
     int                 i_screen_depth;  /* significant bpp: 8, 15, 16 or 24 */
     int                 i_bytes_per_pixel;/* real screen depth: 1, 2, 3 or 4 */
     float               f_gamma;                                    /* gamma */
+    boolean_t           b_need_render;  /* does the output method need a YUV 
+                                         * conversion ?                      */
 
     /* Color masks and shifts in RGB mode - masks are set by system
      * initialization, shifts are calculated. A pixel color value can be
@@ -183,6 +179,7 @@ typedef struct vout_thread_s
     boolean_t           b_scale;                    /* allow picture scaling */
     mtime_t             render_time;             /* last picture render time */
 
+
     /* Idle screens management */
     mtime_t             last_display_date;     /* last non idle display date */
     mtime_t             last_idle_date;            /* last idle display date */
@@ -202,6 +199,7 @@ typedef struct vout_thread_s
     subpicture_t        p_subpicture[VOUT_MAX_PICTURES];      /* subpictures */
     int                 i_pictures;                     /* current heap size */
     vout_yuv_t          yuv;                           /* translation tables */
+    picture_t *         p_rendered_pic;  /* picture currently being rendered */
 
     /* Bitmap fonts */
     p_vout_font_t       p_default_font;                      /* default font */