From patchwork Thu Sep 7 20:12:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Janatra X-Patchwork-Id: 5051 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp721794jao; Thu, 7 Sep 2017 15:26:38 -0700 (PDT) X-Received: by 10.223.174.141 with SMTP id y13mr476682wrc.209.1504823198306; Thu, 07 Sep 2017 15:26:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504823198; cv=none; d=google.com; s=arc-20160816; b=LlktnuKlMdZrSU/EfdsrZvOoivir4/GnlZ5oirLf+hTiE8iXKo2aomam1LhC/fVbwQ fVGuuNgh/KT9/eZrp7f2K62GWNG0OPxk7fOeVR+OMSo450nzAHqx0r3raQcSVRlmNETm lcSbKAnOeQS9letSMhFgysJ0WhvwjvRE+ZPMJZwERWoWkYvwKFyhb3fnKMw3SUYZJ9km Y9wcD9wYCFxkLUFGzd2lRaLMsWWKYwjk/KUVpGoDZBv2HyeHlDpA79x5cgwJSCk5qf2k 2Gq5mifC6q5bY5MOp9XHlHaO94EdT4fbubYsYVenAVNtqnWe9PFuWhrWNY2OOqJwt1mO jNiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=sq/0ClCcuUf0mNELG3w1zGDTkSTzShEusfUBUxb3LH8=; b=xI5FEpD+ZE7hYj81yZfpvdtT8jxRMhPp2eDcfZAhvo99C8h9W3N87aGQc+ZJJXGgQP mfF4VNNWw8SI/seh9pXDGzcT+71tSMUlFvkPwy9AYFO/czaiMUa6EQFjdo/Q/wN3LlSh Bn1YEesdovDSRKtUnWvn/kiKVyPPe/GkxJgN/dRREKatE1Bn9bOxyfsUgipJ52r9FQGK b5xOoP0H9NPMNzbk6iGWAG5MED8oqiz2Um5Ac0MinHAvFQvxdwwYBcPpMT7WE5/rfzad Giat3YrfVaJtzLKvogLjH3GIzHeFyvID973O+Jcpgjfy/pkhO/zVZkr2/2LLYQi4IOs/ IwGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=mt04IgpT; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q6si202158wmd.232.2017.09.07.15.26.37; Thu, 07 Sep 2017 15:26:38 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=mt04IgpT; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1619D689F3A; Fri, 8 Sep 2017 01:26:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f173.google.com (mail-pf0-f173.google.com [209.85.192.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44754689DEE for ; Thu, 7 Sep 2017 23:12:28 +0300 (EEST) Received: by mail-pf0-f173.google.com with SMTP id e1so1141440pfk.1 for ; Thu, 07 Sep 2017 13:12:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=eizPUwEDpymuwtSG28baJa5yNtun2yxtWrYAe4WMVr8=; b=mt04IgpT4wKpU9UMwz5CFkqcgsJgHqOFrQGcjoIOYlzNkDcp85EoRO375woTY7UP1C +S3VeThtAWPRCqJyksAUrxs8T4/p4k6/eZ7D3aT1ULuLhGrN8BJjSDAo9OEyAPVe5piv bmRAd3gs2WXnHiCBrjl2u3JawBabVQiuoZj/BDGiVIOUSDmYHuUitWXlksvhIAQB7/qA Nqe8E0VJgoclRfVP9Rk8zuLFoektmFZ1pIWaPpvztrWvz/s9GPkMmG9qjlLCTKRTfZPP ozNmRMdtXItngaOChq3HW18GQGniCWVlRTIiOpwaDUnppTPlY+z9MQLVC/X2NXU+fiDd +MCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=eizPUwEDpymuwtSG28baJa5yNtun2yxtWrYAe4WMVr8=; b=ljV+1vQCoNrSDQdapkejvVkITrJpTRv331gAnBF5TtJTy1P02kAgJ1BDZh0ofMFLnV xlu4ORb/KF+eQ+0VC/34zbQhP0Wxn2iymLyAFz3t0ixkE9XgpIKUXNMzdXMvXqdpxD9s oS7aOCvA3QPBvvRgyBzyZvfB506rmPwf8bshQVUrQxC0EB9Io/8I8tyNTuhT+OxyeS5Q RG2YwF8JoFsrmWY0HXcwmj7nHOu0FVY8NbZiBHqCm4cmasaQD0Ewmsrm8S8bXYDfgTfG 8i2Uf8aoaN2Mc3qjBxcO1UVmohXtDaMS7JoOCmZbWsS6BFZLwGnlZfxCKM4ZwacWHfi4 rzvQ== X-Gm-Message-State: AHPjjUg6U10bl7uBpldAmJu0DiwldvlfvSiSjYqUAwavZ+JI8awIQjeN YVIIlk9tzmBfUnYwtULsnQ== X-Google-Smtp-Source: ADKCNb4UIiY5ef7yILOYnLTjQIqDjMRkFgTGjQkkskaRILIwFglGs3q2ibcGUhdYHKsd2zQVnsHyFA== X-Received: by 10.101.77.197 with SMTP id q5mr588517pgt.108.1504815149920; Thu, 07 Sep 2017 13:12:29 -0700 (PDT) Received: from janatra0.mtv.corp.google.com ([100.98.24.66]) by smtp.gmail.com with ESMTPSA id z89sm603891pff.13.2017.09.07.13.12.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Sep 2017 13:12:29 -0700 (PDT) From: Ivan Janatra To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Sep 2017 13:12:08 -0700 Message-Id: <20170907201208.99612-1-janatra@google.com> X-Mailer: git-send-email 2.14.1.581.gf28d330327-goog X-Mailman-Approved-At: Fri, 08 Sep 2017 01:26:31 +0300 Subject: [FFmpeg-devel] [PATCH] libavformat/matroskaenc.c: Write Tags element for WebM X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Ivan Janatra MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is already supported per https://www.webmproject.org/docs/container/#Tags and https://github.com/nbirkbeck/matroska-specification/commit/28a54f991f118fff31fe6bfe256c2dfab46d00e5 --- libavformat/matroskaenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 9cc7be352e..5b70fead87 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1988,12 +1988,12 @@ static int mkv_write_header(AVFormatContext *s) ret = mkv_write_attachments(s); if (ret < 0) goto fail; - - ret = mkv_write_tags(s); - if (ret < 0) - goto fail; } + ret = mkv_write_tags(s); + if (ret < 0) + goto fail; + if (!(s->pb->seekable & AVIO_SEEKABLE_NORMAL) && !mkv->is_live) mkv_write_seekhead(pb, mkv);