[vlc-commits] vlc_es: remove text_style defaults from spu

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Jan  5 20:13:48 2018 +0100| [a82ab618d16228ee15840974c987dbaa6ed9a1b5] | committer: Francois Cartegnie

vlc_es: remove text_style defaults from spu

was only used by tx3g and didn't allow much

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

 include/vlc_es.h     |  3 ---
 src/input/es_out.c   |  2 --
 src/misc/es_format.c | 11 -----------
 3 files changed, 16 deletions(-)

diff --git a/include/vlc_es.h b/include/vlc_es.h
index c03fca394a..718dfc42b1 100644
--- a/include/vlc_es.h
+++ b/include/vlc_es.h
@@ -26,7 +26,6 @@
 
 #include <vlc_common.h>
 #include <vlc_fourcc.h>
-#include <vlc_text_style.h>
 #include <vlc_viewpoint.h>
 
 /**
@@ -544,8 +543,6 @@ struct subs_format_t
         /* Reorder depth of transport video, -1 for no reordering */
         int i_reorder_depth;
     } cc;
-
-    text_style_t *p_style; /* Default styles to use */
 };
 
 #define SPU_PALETTE_DEFINED  0xbeefbeef
diff --git a/src/input/es_out.c b/src/input/es_out.c
index 2284f86542..d1c8d9a4b1 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -3020,8 +3020,6 @@ static void EsOutUpdateInfo( es_out_t *out, es_out_id_t *es, const es_format_t *
         {
             if (update.subs.psz_encoding == NULL)
                 update.subs.psz_encoding = es->fmt.subs.psz_encoding;
-            if (update.subs.p_style == NULL)
-                update.subs.p_style = es->fmt.subs.p_style;
         }
         if (update.i_extra_languages == 0)
         {
diff --git a/src/misc/es_format.c b/src/misc/es_format.c
index 1c9a78e1a4..98a130d40e 100644
--- a/src/misc/es_format.c
+++ b/src/misc/es_format.c
@@ -506,12 +506,6 @@ int es_format_Copy(es_format_t *restrict dst, const es_format_t *src)
             if (unlikely(dst->subs.psz_encoding == NULL))
                 ret = VLC_ENOMEM;
         }
-        if (src->subs.p_style != NULL)
-        {
-            dst->subs.p_style = text_style_Duplicate(src->subs.p_style);
-            if (unlikely(dst->subs.p_style == NULL))
-                ret = VLC_ENOMEM;
-        }
     }
 
     if (src->i_extra_languages > 0)
@@ -549,13 +543,8 @@ void es_format_Clean(es_format_t *fmt)
     if (fmt->i_cat == VIDEO_ES)
         video_format_Clean( &fmt->video );
     if (fmt->i_cat == SPU_ES)
-    {
         free(fmt->subs.psz_encoding);
 
-        if (fmt->subs.p_style != NULL)
-            text_style_Delete(fmt->subs.p_style);
-    }
-
     for (unsigned i = 0; i < fmt->i_extra_languages; i++)
     {
         free(fmt->p_extra_languages[i].psz_language);