[vlc-commits] codec/ttml: substtml: s, DictionnaryMerge, DictionaryMerge,

[Filip Roséen]

vlc | branch: master | Filip Roséen <filip at atch.se> | Thu May 18 12:19:32 2017 +0200| [34df02060bce4f0b3ff8e938b823f6fa9aa28cf9] | committer: Rémi Denis-Courmont

codec/ttml: substtml: s, DictionnaryMerge, DictionaryMerge,

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

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

 modules/codec/ttml/substtml.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/codec/ttml/substtml.c b/modules/codec/ttml/substtml.c
index 6302497534..ec9bd327d2 100644
--- a/modules/codec/ttml/substtml.c
+++ b/modules/codec/ttml/substtml.c
@@ -399,7 +399,7 @@ static void FillTTMLStyle( const char *psz_attr, const char *psz_val,
     else FillTextStyle( psz_attr, psz_val, p_ttml_style->font_style );
 }
 
-static void DictionnaryMerge( const vlc_dictionary_t *p_src, vlc_dictionary_t *p_dst )
+static void DictionaryMerge( const vlc_dictionary_t *p_src, vlc_dictionary_t *p_dst )
 {
     for( int i = 0; i < p_src->i_size; ++i )
     {
@@ -423,7 +423,7 @@ static void DictMergeWithStyleID( ttml_context_t *p_ctx, const char *psz_id,
         const tt_node_t *p_node = FindNode( p_ctx->p_rootnode,
                                             "style", -1, psz_id );
         if( p_node )
-            DictionnaryMerge( &p_node->attr_dict, p_dst );
+            DictionaryMerge( &p_node->attr_dict, p_dst );
     }
 }
 
@@ -448,12 +448,12 @@ static void DictMergeWithRegionID( ttml_context_t *p_ctx, const char *psz_id,
             const tt_node_t *p_node = (const tt_node_t *) p_child;
             if( !tt_node_NameCompare( p_node->psz_node_name, "style" ) )
             {
-                DictionnaryMerge( &p_node->attr_dict, p_dst );
+                DictionaryMerge( &p_node->attr_dict, p_dst );
             }
         }
 
         /* Merge region attributes */
-        DictionnaryMerge( &p_regionnode->attr_dict, p_dst );
+        DictionaryMerge( &p_regionnode->attr_dict, p_dst );
     }
 }
 
@@ -479,7 +479,7 @@ static ttml_style_t * InheritTTMLStyles( ttml_context_t *p_ctx, tt_node_t *p_nod
     /* Merge dics backwards without overwriting */
     for( ; p_node; p_node = p_node->p_parent )
     {
-        DictionnaryMerge( &p_node->attr_dict, &merged );
+        DictionaryMerge( &p_node->attr_dict, &merged );
 
         const char *psz_styleid = (const char *)
                 vlc_dictionary_value_for_key( &p_node->attr_dict, "style" );