[vlc-commits] es_out: fix track infos regression

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Sep  5 12:52:05 2018 +0200| [688a858834ec7cdb3f7abb652b3287cd05cd35db] | committer: Thomas Guillem

es_out: fix track infos regression

Regression from 7e719ff464f48cc13977fd54980e28e783612816

Add a missing input_item_UpdateTracksInfo(). Indeed, tracks were updated only
if the format was changed from the decoders (and therefore killed preparsing).

Revert back tracks i_codec to the original demuxer i_codec. Indeed, it seems
that the following statement was a bad idea:

"The fmt of the ES events will now keep the decoder codec. The original codec
from the demuxer is still available via fmt.i_original_fourcc."

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

 src/input/es_out.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 45cea092b1..b215c3bce1 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -3214,6 +3214,7 @@ static int EsOutEsUpdateFmt(es_out_t *out, es_out_id_t *es,
     update.i_id = es->fmt.i_id;
     update.i_group = es->fmt.i_group;
     update.i_priority = es->fmt.i_priority;
+    update.i_codec = es->fmt.i_codec;
     update.i_original_fourcc = es->fmt.i_original_fourcc;
 
     if (update.psz_language == NULL)
@@ -3259,6 +3260,8 @@ static void EsOutUpdateInfo( es_out_t *out, es_out_id_t *es, const vlc_meta_t *p
     const es_format_t *p_fmt_es = &es->fmt;
     const es_format_t *fmt = es->fmt_out.i_cat != UNKNOWN_ES ? &es->fmt_out : &es->fmt;
 
+    input_item_UpdateTracksInfo( p_item , fmt );
+
     /* Create category */
     char* psz_cat = EsInfoCategoryName( es );