[vlc-commits] demux: smooth: use es_format_Change

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jul  5 16:14:00 2017 +0200| [eaede13740a2971da807d7d29907a605454725cd] | committer: Francois Cartegnie

demux: smooth: use es_format_Change

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

 modules/demux/smooth/playlist/ForgedInitSegment.cpp | 3 +--
 modules/mux/mp4/libmp4mux.c                         | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/demux/smooth/playlist/ForgedInitSegment.cpp b/modules/demux/smooth/playlist/ForgedInitSegment.cpp
index e06ca2abff..828e1fe9b2 100644
--- a/modules/demux/smooth/playlist/ForgedInitSegment.cpp
+++ b/modules/demux/smooth/playlist/ForgedInitSegment.cpp
@@ -215,9 +215,8 @@ block_t * ForgedInitSegment::buildMoovBox()
     trackinfo.i_trex_default_length = 1;
     trackinfo.i_trex_default_size = 1;
 
-    trackinfo.fmt.i_cat = es_type;
+    es_format_Change(&trackinfo.fmt, es_type, vlc_fourcc_GetCodec(es_type, fourcc));
     trackinfo.fmt.i_original_fourcc = fourcc;
-    trackinfo.fmt.i_codec = vlc_fourcc_GetCodec(es_type, fourcc);
     switch(es_type)
     {
         case VIDEO_ES:
diff --git a/modules/mux/mp4/libmp4mux.c b/modules/mux/mp4/libmp4mux.c
index 645a57d3df..ec7a8b2279 100644
--- a/modules/mux/mp4/libmp4mux.c
+++ b/modules/mux/mp4/libmp4mux.c
@@ -50,7 +50,7 @@ bool mp4mux_trackinfo_Init(mp4mux_trackinfo_t *p_stream, unsigned i_id,
     if(!p_stream->entry)
         return false;
 
-    es_format_Init(&p_stream->fmt, 0, 0);
+    es_format_Init(&p_stream->fmt, UNKNOWN_ES, 0);
 
     return true;
 }