From 0deace8000b82deea58101f9b047c7e1226e6697 Mon Sep 17 00:00:00 2001 From: Michael Bradshaw Date: Mon, 20 Jun 2016 14:25:48 -0700 Subject: [PATCH 1/1] libavformat/matroskaenc: omit segment UID for webm SegmentUID is not a supported element in WebM. See: http://www.webmproject.org/docs/container/#SegmentUID --- libavformat/matroskaenc.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 6252de8..ddac2d3 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1559,20 +1559,23 @@ static int mkv_write_header(AVFormatContext *s) if ((tag = av_dict_get(s->metadata, "title", NULL, 0))) put_ebml_string(pb, MATROSKA_ID_TITLE, tag->value); if (!(s->flags & AVFMT_FLAG_BITEXACT)) { - uint32_t segment_uid[4]; - AVLFG lfg; - - av_lfg_init(&lfg, av_get_random_seed()); - - for (i = 0; i < 4; i++) - segment_uid[i] = av_lfg_get(&lfg); - put_ebml_string(pb, MATROSKA_ID_MUXINGAPP, LIBAVFORMAT_IDENT); if ((tag = av_dict_get(s->metadata, "encoding_tool", NULL, 0))) put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, tag->value); else put_ebml_string(pb, MATROSKA_ID_WRITINGAPP, LIBAVFORMAT_IDENT); - put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segment_uid, 16); + + if (mkv->mode != MODE_WEBM) { + uint32_t segment_uid[4]; + AVLFG lfg; + + av_lfg_init(&lfg, av_get_random_seed()); + + for (i = 0; i < 4; i++) + segment_uid[i] = av_lfg_get(&lfg); + + put_ebml_binary(pb, MATROSKA_ID_SEGMENTUID, segment_uid, 16); + } } else { const char *ident = "Lavf"; put_ebml_string(pb, MATROSKA_ID_MUXINGAPP , ident); -- 2.9.0