From ea617c8e24f2e748b892120340e22dc35a0fc8a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20T=C3=B6rnblom?= Date: Mon, 5 Mar 2012 17:34:10 +0100 Subject: [PATCH] fix offset for metainfo when metatags are present. not sure how these values add up but mkvalidator claims they are correct --- src/dvr/mkmux.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/dvr/mkmux.c b/src/dvr/mkmux.c index 6aea66fb..6b42f008 100644 --- a/src/dvr/mkmux.c +++ b/src/dvr/mkmux.c @@ -664,15 +664,16 @@ mk_build_segment(mk_mux_t *mkm, htsbuf_queue_t q; htsbuf_queue_t *p = htsbuf_queue_alloc(0); htsbuf_queue_init(&q, 0); - - mkm->segmentinfo_pos = 33; + int offset = e ? 48 : 33; + + mkm->segmentinfo_pos = offset; ebml_append_master(&q, 0x1549a966, mk_build_segment_info(mkm)); - mkm->trackinfo_pos = 33 + q.hq_size; + mkm->trackinfo_pos = offset + q.hq_size; ebml_append_master(&q, 0x1654ae6b, mk_build_tracks(mkm, ss)); if(e) { - mkm->metadata_pos = 33 + q.hq_size; + mkm->metadata_pos = offset + q.hq_size; ebml_append_master(&q, 0x1254c367, mk_build_metadata2(e)); }