[vlc-devel] [PATCH 3/7] transcode: video: remove remainings of p_final_conv_static

[Steve Lhomme]

---
 modules/stream_out/transcode/transcode.h |  1 -
 modules/stream_out/transcode/video.c     | 11 ++---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/modules/stream_out/transcode/transcode.h b/modules/stream_out/transcode/transcode.h
index 0ca725d46bd..af84a6c421f 100644
--- a/modules/stream_out/transcode/transcode.h
+++ b/modules/stream_out/transcode/transcode.h
@@ -125,7 +125,6 @@ struct sout_stream_id_sys_t
              filter_chain_t  *p_conv_nonstatic;
              filter_chain_t  *p_conv_static;
              filter_chain_t  *p_uf_chain; /**< User-specified video filters */
-             filter_chain_t  *p_final_conv_static;
              vlc_blender_t   *p_spu_blender;
              spu_t           *p_spu;
              vlc_decoder_device *dec_dev;
diff --git a/modules/stream_out/transcode/video.c b/modules/stream_out/transcode/video.c
index 0e5f589b417..5b793932806 100644
--- a/modules/stream_out/transcode/video.c
+++ b/modules/stream_out/transcode/video.c
@@ -408,7 +408,6 @@ static void transcode_video_filters_clean( sout_stream_id_sys_t *id )
     transcode_remove_filters( &id->p_conv_nonstatic );
     transcode_remove_filters( &id->p_conv_static );
     transcode_remove_filters( &id->p_uf_chain );
-    transcode_remove_filters( &id->p_final_conv_static );
 }
 
 void transcode_video_clean( sout_stream_id_sys_t *id )
@@ -655,14 +654,8 @@ int transcode_video_process( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
             for ( ;; p_in = NULL /* drain second time */ )
             {
                 /* Run user specified filter chain */
-                filter_chain_t * secondary_chains[] = { id->p_uf_chain,
-                                                        id->p_final_conv_static };
-                for( size_t i=0; p_in && i<ARRAY_SIZE(secondary_chains); i++ )
-                {
-                    if( !secondary_chains[i] )
-                        continue;
-                    p_in = filter_chain_VideoFilter( secondary_chains[i], p_in );
-                }
+                if( id->p_uf_chain )
+                    p_in = filter_chain_VideoFilter( id->p_uf_chain, p_in );
 
                 if( !p_in )
                     break;
-- 
2.26.2