From patchwork Sun Feb 11 19:42:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 7557 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp3254192jai; Sun, 11 Feb 2018 11:42:59 -0800 (PST) X-Google-Smtp-Source: AH8x225/Eh/IdVfYNgEF8ThqQJ3GfDflXs+vEQVjFhtvL4yzpUp7wE8Rt75Mw5FKKjaNS3STSCAa X-Received: by 10.223.133.7 with SMTP id 7mr8380098wrh.96.1518378179039; Sun, 11 Feb 2018 11:42:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518378179; cv=none; d=google.com; s=arc-20160816; b=Gv4zcmLx0x+bGIZ+rfg1EvLjd+SGXnUMsXLifO2OWKdG3YPbMjJEdmF5Hao/RDMcHx KPl30pF9ttSylk46qGUEmxGD7c89CzoCkl/slRkzJnWSd8sSwUgH54jiUCHWtj6lg3Vu d969Qro5v/9ys2usAOQciUUeYOij8x2V+lw2/Gsi2hLeL54qllNBICQyXVyznO4qa0JX eDtfSII5TmOdn6b2EKJ6cjt2QLY00YHA7YqkEjfhbIBq36oHjpPcb0sBBJrJi7SLGdiK I6azEZK/Yb91e8E2Qe7HXJrC49a5Mf8L+GBh+fOr/LXN9lvNT5p7PcnScCWTmcCkJpu9 JHLg== 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:references:in-reply-to:mime-version :dkim-signature:delivered-to:arc-authentication-results; bh=3Ea/bmVSkty9vxtaJJ2mE/IzfMpfpbpwwUu0bK+q8OA=; b=dySovx9bBLBl3+LjU9yVBk1kh5SMC+OXyKs1lPzGhyyWCcNDfyCsVvQ/94W2ZMNx7e P6JDVHpAmLqMMoNYXNHSn+22dt9fn6dsBw2TOS9m7CH/xVzJLAT/eDtHrnfITrh40Vt6 SU17P82Ce4D51YwIxKswDLB2OS2qI1Rtsq+1v7v8uoLPDGDhfdzjby4LVng88IfTjW95 ic9lytd8J3mz16otaBfSoetDO5lDwYkFxgCMXPnySSCqgHdLtrUnkp3CTDfUcVIs8G8N qMyd6Kh3GWl8xgySTVc2vWzD9S8GQodN+OxeRuCMBosE3pWLOGRfOtJX50wPq0B5i1X8 GqFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=c4pQxqA+; 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 u14si5099329wrb.113.2018.02.11.11.42.58; Sun, 11 Feb 2018 11:42:58 -0800 (PST) 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=c4pQxqA+; 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 BEB2F680414; Sun, 11 Feb 2018 21:42:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f170.google.com (mail-io0-f170.google.com [209.85.223.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 237EC6802C9 for ; Sun, 11 Feb 2018 21:42:40 +0200 (EET) Received: by mail-io0-f170.google.com with SMTP id 72so15125743iom.10 for ; Sun, 11 Feb 2018 11:42:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=1oytjGu1rsgeKbDkV2gIegrJOhAvNfFzn/vqVUFIEr8=; b=c4pQxqA+elgoIIVZ4endnlMN0uzr0JIFWwWvrPtkR5vdl4Hw4jqCVmd2T0OOrRjWK/ f4IHkWRt5lTHtuNwxrEdnjMqrdpzr6Ux8+Mkh783GIj/NUCMbnVByxj77XKYDVMJeMj8 1ksL5ndL0M0mJPU5u4ZAuQspt9VCiMyLSJ2zb2deHNBERgzxY4z/+DCzWmhABFAiSw9P aCWWb51O6Ugz8TwsAmU6x312dpNeKw4a+0P+jtXUEycdFqGAGG5i6jUnUMRRz2OpZyRW YLqObcqsVJuNq0beg+PBk9ncUfSD4TyWhmwIB3brKIUa0A70S3y7p+aVwYj64IHDbdcf E6Hg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=1oytjGu1rsgeKbDkV2gIegrJOhAvNfFzn/vqVUFIEr8=; b=Y7XVxdbFXtoNQUo9q11S5pNndYi7gzMyT74Njo/2QN0Rou8oYmk7Sr3Ix9LRLmHCAc o75dHMGmjy5N/39hb8vh0PISEutzXz5dttvPzXfLjFUe7fry79M3VbSH8LEGYQ+hCHXT ReBapZDWMnDpcLlI7LQvRNF5uUPF/O+u1TXXVs9u740zFl6gEhYQN+9y1wZE5RT5JuXA LayE0aq3QEG9bX7660Mh1TO1ilA1evoidsvI8UhNRmLGSq3bvqPN8eam7tgRKn755Ako pvdI1eXLoQMsJ3G8Yn4EjYMPctxFJ/k0XprzZYCO8nseKZTTISlv8tkeD2zTN0MhDrSf 5hhA== X-Gm-Message-State: APf1xPBgS7F0agAVa1fdJz5fJDcTvAUiaoN6XuwFMy2Itou7D6shL3Ig xxLR05Rc4qkdq2IN8dxR6MvG+yiUHn9Bp4jbU2s= X-Received: by 10.107.169.94 with SMTP id s91mr10677917ioe.83.1518378168998; Sun, 11 Feb 2018 11:42:48 -0800 (PST) MIME-Version: 1.0 Received: by 10.2.130.68 with HTTP; Sun, 11 Feb 2018 11:42:28 -0800 (PST) In-Reply-To: <20180211192311.GA3702985@phare.normalesup.org> References: <20180211192311.GA3702985@phare.normalesup.org> From: Carl Eugen Hoyos Date: Sun, 11 Feb 2018 20:42:28 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [FFmpeg-devel] [PATCH]lavf/matroskaenc: Do not allow -reserve_index_space 1 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" 2018-02-11 20:23 GMT+01:00 Nicolas George : > Carl Eugen Hoyos (2018-02-11): >> Attached patch fixes an assertion failure with the following command line: >> $ ffmpeg -f lavfi -i testsrc -reserve_index_space 1 out.mkv > Reading the code, it is pretty obvious that 0 is a valid value and > forbidding it would be bad. It is still the used default value... Uglier alternative attached. Carl Eugen From 6a08d7cb89294b81e87dac93bbf58627e5d37cec Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 11 Feb 2018 20:41:32 +0100 Subject: [PATCH] lavf/matroskaenc: Force the minimum value for -reserve_index_space to 2. Fixes an assertion failure: Assertion size >= 2 failed at libavformat/matroskaenc.c:298 --- libavformat/matroskaenc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f22c2ab..5950b4d 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2001,6 +2001,8 @@ static int mkv_write_header(AVFormatContext *s) } if ((pb->seekable & AVIO_SEEKABLE_NORMAL) && mkv->reserve_cues_space) { mkv->cues_pos = avio_tell(pb); + if (mkv->reserve_cues_space == 1) + mkv->reserve_cues_space++; put_ebml_void(pb, mkv->reserve_cues_space); } -- 1.7.10.4