Removed now unused pf_pre_render in subpicture_t.

diff --git a/include/vlc_subpicture.h b/include/vlc_subpicture.h
index bdb09fdf408dfc6a2d3796332cb60504c830d7ae..dcd15cbc83eab979a20f705c933cc0fec8fefa4a 100644 (file)
--- a/include/vlc_subpicture.h
+++ b/include/vlc_subpicture.h
@@ -152,8 +152,7 @@ struct subpicture_t
     /** Pointer to function that cleans up the private data of this subtitle */
     void ( *pf_destroy ) ( subpicture_t * );
 
-    /** Pointer to functions for region management */
-    void (*pf_pre_render)    ( spu_t *, subpicture_t *, const video_format_t * );
+    /** Pointer to function that update the regions before rendering (optionnal) */
     void (*pf_update_regions)( spu_t *,
                                subpicture_t *, const video_format_t *, mtime_t );
 

diff --git a/src/video_output/vout_subpictures.c b/src/video_output/vout_subpictures.c
index 4f8512dbec506142571e6daa24b7a7cbe3c1ce9e..353ec359ba6c094cbbe830683e8468b251159d85 100644 (file)
--- a/src/video_output/vout_subpictures.c
+++ b/src/video_output/vout_subpictures.c
@@ -379,10 +379,6 @@ void spu_RenderSubpictures( spu_t *p_spu,
             p_subpic != NULL;
                 p_subpic = p_subpic->p_next )
     {
-        /* TODO remove pre-render */
-        if( p_subpic->pf_pre_render )
-            p_subpic->pf_pre_render( p_spu, p_subpic, p_fmt_dst );
-
         if( p_subpic->pf_update_regions )
         {
             video_format_t fmt_org = *p_fmt_dst;