[vlc-devel] [PATCH 06/11] core: use es_format_Replace when copying an es_format_t on an initialized one

[Steve Lhomme]

---
 src/input/decoder.c     |  3 +--
 src/input/es_out.c      |  3 +--
 src/misc/filter_chain.c | 16 ++++------------
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 2c896400b7..36ed920ecc 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -263,8 +263,7 @@ static void DecoderUpdateFormatLocked( decoder_t *p_dec )
 
     vlc_assert_locked( &p_owner->lock );
 
-    es_format_Clean( &p_owner->fmt );
-    es_format_Copy( &p_owner->fmt, &p_dec->fmt_out );
+    es_format_Replace( &p_owner->fmt, &p_dec->fmt_out );
 
     /* Move p_description */
     if( p_dec->p_description != NULL )
diff --git a/src/input/es_out.c b/src/input/es_out.c
index e0a1878f59..67eb5593b4 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -2481,8 +2481,7 @@ static int EsOutControlLocked( es_out_t *out, int i_query, va_list args )
         if( es == NULL )
             return VLC_EGENERIC;
 
-        es_format_Clean( &es->fmt );
-        es_format_Copy( &es->fmt, p_fmt );
+        es_format_Replace( &es->fmt, p_fmt );
 
         if( es->p_dec )
         {
diff --git a/src/misc/filter_chain.c b/src/misc/filter_chain.c
index 02e389d4ef..a9fcc6e2e1 100644
--- a/src/misc/filter_chain.c
+++ b/src/misc/filter_chain.c
@@ -168,15 +168,10 @@ void filter_chain_Reset( filter_chain_t *p_chain, const es_format_t *p_fmt_in,
         filter_chain_DeleteFilter( p_chain, &p_chain->first->filter );
 
     if( p_fmt_in )
-    {
-        es_format_Clean( &p_chain->fmt_in );
-        es_format_Copy( &p_chain->fmt_in, p_fmt_in );
-    }
+        es_format_Replace( &p_chain->fmt_in, p_fmt_in );
+
     if( p_fmt_out )
-    {
-        es_format_Clean( &p_chain->fmt_out );
-        es_format_Copy( &p_chain->fmt_out, p_fmt_out );
-    }
+        es_format_Replace( &p_chain->fmt_out, p_fmt_out );
 }
 
 static filter_t *filter_chain_AppendInner( filter_chain_t *chain,
@@ -228,10 +223,7 @@ static filter_t *filter_chain_AppendInner( filter_chain_t *chain,
         goto error;
 
     if( filter->b_allow_fmt_out_change )
-    {
-        es_format_Clean( &chain->fmt_out );
-        es_format_Copy( &chain->fmt_out, &filter->fmt_out );
-    }
+        es_format_Replace( &chain->fmt_out, &filter->fmt_out );
 
     if( chain->last == NULL )
     {
-- 
2.12.1