vlc | branch: master | Steve Lhomme <[email protected]> | Thu Jul 6 14:51:59 2017 +0200| [acc69aed7fd535930bffe6cbb8bcdae51ab799b7] | committer: Jean-Baptiste Kempf
es_out: only copy the SPU strings on SPU tracks in EsOutUpdateInfo() Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=acc69aed7fd535930bffe6cbb8bcdae51ab799b7 --- src/input/es_out.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/input/es_out.c b/src/input/es_out.c index 69ea835fda..e0a1878f59 100644 --- a/src/input/es_out.c +++ b/src/input/es_out.c @@ -2961,10 +2961,13 @@ static void EsOutUpdateInfo( es_out_t *out, es_out_id_t *es, const es_format_t * update.psz_language = es->fmt.psz_language; if (update.psz_description == NULL) update.psz_description = es->fmt.psz_description; - 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_cat == SPU_ES) + { + 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) { assert(update.p_extra_languages == NULL); _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
