[vlc-commits] commit: Removed dead code (vout). (Laurent Aimar )

[git at videolan.org]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon May 10 22:01:13 2010 +0200| [b874f1bf91ea9d0eb3b435e8b7162dab6c7b2788] | committer: Laurent Aimar 

Removed dead code (vout).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b874f1bf91ea9d0eb3b435e8b7162dab6c7b2788
---

 src/video_output/video_output.c  |   29 +----------------------------
 src/video_output/vout_internal.h |    1 -
 2 files changed, 1 insertions(+), 29 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 8d82a41..a703260 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -136,33 +136,7 @@ vout_thread_t *vout_Request( vlc_object_t *p_this, vout_thread_t *p_vout,
     {
         vlc_mutex_lock( &p_vout->p->change_lock );
 
-        /* We don't directly check for the "vout-filter" variable for obvious
-         * performance reasons. */
-        if( p_vout->p->b_filter_change )
-        {
-            char *psz_filter_chain = var_GetString( p_vout, "vout-filter" );
-
-            if( psz_filter_chain && !*psz_filter_chain )
-            {
-                free( psz_filter_chain );
-                psz_filter_chain = NULL;
-            }
-            if( p_vout->p->psz_filter_chain && !*p_vout->p->psz_filter_chain )
-            {
-                free( p_vout->p->psz_filter_chain );
-                p_vout->p->psz_filter_chain = NULL;
-            }
-
-            if( !psz_filter_chain && !p_vout->p->psz_filter_chain )
-            {
-                p_vout->p->b_filter_change = false;
-            }
-
-            free( psz_filter_chain );
-        }
-
-        if( !video_format_IsSimilar( &p_vout->p->original, p_fmt ) ||
-            p_vout->p->b_filter_change )
+        if( !video_format_IsSimilar( &p_vout->p->original, p_fmt ) )
         {
             vlc_mutex_unlock( &p_vout->p->change_lock );
 
@@ -250,7 +224,6 @@ vout_thread_t * (vout_Create)( vlc_object_t *p_parent, video_format_t *p_fmt )
     vout_control_Init( &p_vout->p->control );
     vout_chrono_Init( &p_vout->p->render, 5, 10000 ); /* Arbitrary initial time */
     vout_statistic_Init( &p_vout->p->statistic );
-    p_vout->p->b_filter_change = 0;
     p_vout->p->i_par_num =
     p_vout->p->i_par_den = 1;
     p_vout->p->displayed.date = VLC_TS_INVALID;
diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index f8baf52..26e8d1e 100644
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -102,7 +102,6 @@ struct vout_thread_sys_t
 
     /* Filter chain */
     char           *psz_filter_chain;
-    bool            b_filter_change;
 
     /* Video filter2 chain */
     vlc_mutex_t     vfilter_lock;