From patchwork Wed Sep 12 15:56:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?U2lncsOtw7B1ciBSZWfDrW5hIFNpZ3Vyw77Ds3JzZMOzdHRpcg==?= X-Patchwork-Id: 10305 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp4990120jap; Wed, 12 Sep 2018 09:02:19 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZwrDyKFpGaYtBBq7zrnxSKI1V6YYfHQEd4RTKxgFO+KZ7Yi77iZA3Xyj7b4z7ZhoRjJX7D X-Received: by 2002:adf:ea92:: with SMTP id s18-v6mr1982673wrm.284.1536768139142; Wed, 12 Sep 2018 09:02:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536768139; cv=none; d=google.com; s=arc-20160816; b=JPfcIKzLntrMNZcHl/18WK3DJqmJBlwK9J6bMJ9TC9dzAkzRI+0ZGpE2jG50//xTzv 3PoWyYsbqVEP87w66499bh9cH8kHZNIcM5VVRlwSfBZnxqJGk4SX9yMBAO/LxqaZv4Oi eDF/5TMWdowzXUMKij01+RofnpZe3x3WrVy37XV3OqN3K6k+gOVl2KU99B0ZD0XTSckL yytgrceGkTUBp7jObR4G8/coRx1fCMC6JFGk7P95IfU58+kSoF2dOB3iwJue9niT6T48 ByWr/pOm56ecpanS2463DYDbShFIUIWfYbXH1SxElaocmjih9sGAih8/v7KalKaiT/ak fsCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:in-reply-to:references:mime-version :dkim-signature:delivered-to; bh=ta92+YjH3zYVOnbJC+x3mHGLg9nd9lHzdZjMayBGlFk=; b=0WYoGQAmvJws0VBcNo9GtjGjtV2UCYjuhjfnOUJ1y8FCZem+CRElmQrqAiiYkNCqzi VGOe0pbADUEZZXUZCTrJyTMzO6fAIZN8nL/FucDpGjfBGBlmd/5KEN7qrkgSQi6qXBLA vH4JvEPMiKkf44VIkAoa7y4HHoHyD+lNjFGLQEp7uhKGIvAhGUe7GU7ZykTalBD/Inj2 ogqOYb1Blf9ZGBKABZeKkuSgM28xp+1/+uRJ25u+ywZ9RccN+4iltad/7E+Xjeo4cKVC YSoPZoqcooli5gonsIA+4WskZuDbsSK7g1jEhH2ySqeJuGpPfny07T4NHMvi2zAeEMde VtcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=vDL9yL8U; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 197-v6si1372073wmb.128.2018.09.12.09.02.18; Wed, 12 Sep 2018 09:02:19 -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=@gmail.com header.s=20161025 header.b=vDL9yL8U; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 194D068A568; Wed, 12 Sep 2018 19:02:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f170.google.com (mail-qk1-f170.google.com [209.85.222.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EDAFD68A296 for ; Wed, 12 Sep 2018 19:01:59 +0300 (EEST) Received: by mail-qk1-f170.google.com with SMTP id z78-v6so1439398qka.0 for ; Wed, 12 Sep 2018 09:02:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=RcsO4tFWO/EkKcrir9zPO0AA0L4jT+24LSLGpQF43Fo=; b=vDL9yL8U4gjE3BfJZy64NAAgunu2jyHz1ZdbWtJ8ewZ8i84Ghdwq9uhl8lQwJAKuvv IbInymnr2RW82REFbrg3s2NCsYRkJRwkYzQyjFbEXjSJwHSsqCeintIUrOnc1u7BVU9l IYaB8+zyfAnG6FV9Zj5oGlu4ddyk/PSspnu+QUZJKzN6aUiizsW+E69Bp7VTYaCHAI0s z70cQ36SmzlPtaQKpLKX3RMRDWeDuuiZ0WfDIkCmxLOV8YsU5OsUGTE3Hg7GOrFq+wlN RmEl8NVQIm/902R5RZMh47SbluctJmH+OPmGtIuQJJRCJ1Ye+O30Mcvuh95P2JPZdYpD LGEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=RcsO4tFWO/EkKcrir9zPO0AA0L4jT+24LSLGpQF43Fo=; b=MDNko237lMebOc5UQGd9EkxXdB+VnMBUKFUJK9CCXK7K0nL+//LJsF177qHs/7Jyv4 03OrrV77C06jgVMibAhd6GmHId6ICQjDGxvbUILYTo4WYd1TOutoYGLQAxHYmVq/lhJZ 2jqnsTehvCSusSGNqsjYCAJMY4hDXeezoVkYmF6LaqpVrsshgP4ZV2D7lqSVpiskR6Qn GRVNJvKj3cQgGTFJiTwAGguf7v0w9qpQyajt471RWbTeLCrXSAJHhTDFzw2umq+ih+UK kpdZQwdWPgUqLtvkYY6TuYk1TS57j0qPZ40icz/vrcfUcHDYCoRfiF/Yx1wo+UtZzkep OH/Q== X-Gm-Message-State: APzg51B13Amk06Tt5/LmADMHgF7iR9ZoQzO4wRmXr2Bu9nzJj91ky7xI B/iJw0SgWpWktcIAg9MOTYDl0S4+f3fHFr7feqrEqpTB X-Received: by 2002:a37:5a06:: with SMTP id o6-v6mr2010798qkb.44.1536767785766; Wed, 12 Sep 2018 08:56:25 -0700 (PDT) MIME-Version: 1.0 References: <37d688b8-23ff-9aa7-23d8-b90ce66e9452@gmail.com> <779a271c-e382-2c6b-77eb-d12096e1f5dc@gmail.com> In-Reply-To: From: =?UTF-8?B?U2lncsOtw7B1ciBSZWfDrW5hIFNpZ3Vyw77Ds3JzZMOzdHRpcg==?= Date: Wed, 12 Sep 2018 11:56:14 -0400 Message-ID: To: ffmpeg-devel@ffmpeg.org Subject: Re: [FFmpeg-devel] [PATCH] avformat/matroskaenc: add reserve free space option 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" On Thu, Sep 6, 2018 at 3:31 PM James Almer wrote: > > On 9/6/2018 4:18 PM, James Darnley wrote: > > On 2018-09-06 19:39, Sigríður Regína Sigurþórsdóttir wrote: > >> + if (s->metadata_header_padding) { > >> + if (s->metadata_header_padding == 1) > >> + s->metadata_header_padding++; > >> + put_ebml_void(pb, s->metadata_header_padding); > >> + } > > > > Unfortunately I was forced to make the default -1 so you want to check > > that the value is greater than 0 rather than just true. > > > > Furthermore I think you will still want to add to Changelog making a > > note that the matroska muxer will now listen to metadata_header_padding. > > No, this kind of change doesn't justify a Changelog entry as mentioned > before. > > > That may also want a micro version bump so that library users can check. > > Micro version bump is ok. Thank you. Here is an updated patch with a bump and a change to make sure the value is > 0. From 08e140fa0b23274a4db18ce0b201e45fe7c1ac97 Mon Sep 17 00:00:00 2001 From: Sigga Regina Date: Wed, 12 Sep 2018 11:47:47 -0400 Subject: [PATCH] avformat/matroskaenc: add reserve free space option --- libavformat/matroskaenc.c | 5 +++++ libavformat/version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 09a62e1..3f5febf 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2005,6 +2005,11 @@ static int mkv_write_header(AVFormatContext *s) ret = AVERROR(ENOMEM); goto fail; } + if (s->metadata_header_padding > 0) { + if (s->metadata_header_padding == 1) + s->metadata_header_padding++; + put_ebml_void(pb, s->metadata_header_padding); + } if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && mkv->reserve_cues_space) { mkv->cues_pos = avio_tell(pb); if (mkv->reserve_cues_space == 1) diff --git a/libavformat/version.h b/libavformat/version.h index 4d21583..d7a1a35 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -33,7 +33,7 @@ // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 #define LIBAVFORMAT_VERSION_MINOR 18 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \