From patchwork Sun Feb 11 19:19:10 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: 7556 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.150.1 with SMTP id c1csp3240424jai; Sun, 11 Feb 2018 11:19:41 -0800 (PST) X-Google-Smtp-Source: AH8x226M8PGiB2Cwl7MeCKWEDGApMquVUUOSIU3TiTcDgS2f6bH0uPRO66cEiIxuaQMyTdzv/+zL X-Received: by 10.223.197.13 with SMTP id q13mr7292939wrf.235.1518376781044; Sun, 11 Feb 2018 11:19:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518376781; cv=none; d=google.com; s=arc-20160816; b=IaGkEU5VjZAm9v2575CKgeFVpK52nqfu6rG2hoCESkiijH9WH/FAdOzX+mwIPTbBLj Qdkqrb6wY9eOlsnlzPNTI579Qrwo+5FIlLwdVmtSvfGolcSwj9P1Ezqr+ejA5zLsp/04 sQJFBFcB7RlK6ADe/rUiU1STMD6c6wqOOyXu5hmpYgtjwsx+/IfMCNULIOSwdAEzSxt+ pK+QbSh2XCfmqvOQP1YaRl60VWQBPW9MOsmYwgfUeZTBeaZaYg0P4OL27NUGX+AooAVQ +iNFc3h6lJl0rC+KDsKaD6SxJISDGLiz4TAC1UFNQCGCGuDA0wuA/IdvKlJKupUuOftU qfqw== 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:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=V7PLi1Fjcip7ywhpE3dpbKIqG669ql5vNegw9R6XTgM=; b=MhEZ10pBrgMvfw0gd7LMIdVoas6/wiiexpMb+Porjvu4QptYKD8l0omEtErC5S5xTH Eyi+3tUa4Ugj0APFGFpRqMdaOWI4jmqnHvmBogaRubg3GdTxOP8mhm7Z701JS0PulYuk IAcqGxo286wXj8SuewoUViTXApB/nB9MYqukc+QempNtUZE/xsrIRXGfoVesfwbndf5j Kuz0fVSu4gFk8mTb98aISaV4TMDg3gfSGLnCUW3hyZx9XjMMmgES6AOv8+63qRZs/ewX dGXPO4NSTHB99nGKAmUkMb7JiOnlhwSh4uKUGOJCDFk0FdV1OOuCYkC7gFvg6erlQNfg csDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Hp3PKtIA; 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 90si5366324wrl.489.2018.02.11.11.19.40; Sun, 11 Feb 2018 11:19:40 -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=Hp3PKtIA; 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 965BA680385; Sun, 11 Feb 2018 21:19:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f174.google.com (mail-io0-f174.google.com [209.85.223.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C777968023A for ; Sun, 11 Feb 2018 21:19:22 +0200 (EET) Received: by mail-io0-f174.google.com with SMTP id b198so15096740iof.6 for ; Sun, 11 Feb 2018 11:19:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=NnYQySmn6xxve664K2aIU3qcy7cCnNreLRG40d6TIoM=; b=Hp3PKtIAZUN5RFp5lfr8yn7ZF35vlS+U2HhfiPcJLuD26clNBV7z3sjFtJHZigq28u NajsZufExUqcnt3DEAd051Atw+LMNaylPbGkIp2ECxnbho8pX+XktuTF8KPopsp8mKR/ 88SfCdzE9sVIUbk+Tedlz7bXiFxoD18iESoijo/LvTUHBL49HCqaW/D1gN4q6hKgVNb5 sPTHq8Vzws9nz74yE23bYL0Vqa66Pfr1y4SG4KGWNSRB+/ynOlSc/Fo6j1W18bKTeKyH NXthxdoNEvZNrJ0rMwcZSnXT9fViB21K82c4LOR02NQG2GjtF8L+6yFWJPITZy0oQTU6 Blig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=NnYQySmn6xxve664K2aIU3qcy7cCnNreLRG40d6TIoM=; b=jLwBWcxOGFyC4OJonXSiZR02n68U50enACJzyjlKE/mJzVBwsfMoLxzKZYWY7Hcgfk /F9DmHyFabLyRshrqY2QF0SDVh3Ip5ORA7CQ+Q83mqtQwiTDLBiAG+s5pVzI+tDn1SUP wEAvFan7Xd5dhqSiqYh2e4QFMv+Ab4uoPQErQ4hIcfAA73knc2a94+csSq2oGNh0rJLJ DJiGmfQBFWi7yGVMXiWQwOFfYRY1dRR7xI9de2+yu+Dsb7IcOpn6HXqeG9/JXnMmEF0z WJfNJqaXdk+cElGzWD1BaIJ0flY0Z1gsD+sE7F3qVapve/1S8yZewiy61A1wzm4mCgWZ x2ag== X-Gm-Message-State: APf1xPA0dOTvbe/9ZiOjcDvMV3JkFJ5nEzBY7ucBCKwp+dEE/dbQWziL 7YdsEjsOwPb+vOzHngO0RVEYXkpBD4MLHEIq1Cg= X-Received: by 10.107.205.195 with SMTP id d186mr11260902iog.31.1518376771330; Sun, 11 Feb 2018 11:19:31 -0800 (PST) MIME-Version: 1.0 Received: by 10.2.130.68 with HTTP; Sun, 11 Feb 2018 11:19:10 -0800 (PST) From: Carl Eugen Hoyos Date: Sun, 11 Feb 2018 20:19:10 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [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" Hi! Attached patch fixes an assertion failure with the following command line: $ ffmpeg -f lavfi -i testsrc -reserve_index_space 1 out.mkv Please comment, Carl Eugen From 4566d5f90f24bf2373175a8aad84c82be6b1a9eb Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 11 Feb 2018 20:16:02 +0100 Subject: [PATCH] lavf/matroskaenc: Do not allow -reserve_index_space 1. Fixes an assertion failure: Assertion size >= 2 failed at libavformat/matroskaenc.c:298 --- libavformat/matroskaenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index f22c2ab..b0dc4dd 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2726,7 +2726,7 @@ static const AVCodecTag additional_subtitle_tags[] = { #define OFFSET(x) offsetof(MatroskaMuxContext, x) #define FLAGS AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { - { "reserve_index_space", "Reserve a given amount of space (in bytes) at the beginning of the file for the index (cues).", OFFSET(reserve_cues_space), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, + { "reserve_index_space", "Reserve a given amount of space (in bytes) at the beginning of the file for the index (cues).", OFFSET(reserve_cues_space), AV_OPT_TYPE_INT, { .i64 = 0 }, 2, INT_MAX, FLAGS }, { "cluster_size_limit", "Store at most the provided amount of bytes in a cluster. ", OFFSET(cluster_size_limit), AV_OPT_TYPE_INT , { .i64 = -1 }, -1, INT_MAX, FLAGS }, { "cluster_time_limit", "Store at most the provided number of milliseconds in a cluster.", OFFSET(cluster_time_limit), AV_OPT_TYPE_INT64, { .i64 = -1 }, -1, INT64_MAX, FLAGS }, { "dash", "Create a WebM file conforming to WebM DASH specification", OFFSET(is_dash), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, -- 1.7.10.4