Commit a82ab618 authored by François Cartegnie's avatar François Cartegnie 🤞

vlc_es: remove text_style defaults from spu

was only used by tx3g and didn't allow much
parent 7ed0d3bf
......@@ -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
......
......@@ -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)
{
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment