From patchwork Wed Nov 20 12:26:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16347 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 35A86447213 for ; Wed, 20 Nov 2019 14:27:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DD2668A745; Wed, 20 Nov 2019 14:27:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EAF4B68A60C for ; Wed, 20 Nov 2019 14:27:08 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id l17so6794253wmh.0 for ; Wed, 20 Nov 2019 04:27:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=0IwC5SVbQ/9s7dUkMbZxtXIKfM5ugrqwGp7exw7W/U0=; b=dRqPzgiLrTqFZ3W7n3j43hcMx0xEiuqFCwKr+eWQfYzb9GuhfUBE+beMDPQPqFCjrS f/qgtekVAWSQmkKe6hMu0sivNt29mFxWlqemOFxA+wr/357snD5pmci6UgKioSXsdOhe GVdwRfmmtZMM8bQG+BAyiKtDdXNQN3ImCw4SRbnO9wOyDdfiszdnUfd4MJ4p0lQlnzdG D/Q62/wS8LiaR72mWM9YDA/mxfz/ujyxaHTMTY7Ohmfq2FD8626xrGw0U/FqukcxsryC Y403fxZDm7iLYIDy2vgFILlnyxEuP3cKE1WwTiDMQYva21nWxeBob+E9IhJOWfyQyWwe 7hYw== 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:mime-version :content-transfer-encoding; bh=0IwC5SVbQ/9s7dUkMbZxtXIKfM5ugrqwGp7exw7W/U0=; b=dIdMaFZGjeSWFf+CCOpaJkQDt7kABEVlgx8tXV3AtklBn/P/1/SQT+L0xiaoaxCemI +XAQP5U/ri43vZ061d7mekGGqzl6WRx8rWTZop/L3Olw+NGeJoplrpCqbNQMJVt2a8sl Ixl+49VQMuaZESx4iDRaLFGl53oHgVaXAqNKv0Ng64CxPAH/bmvXlbfilSE8eAwe7Tdb klLWK6hhp7TfNQ+aowjAfwhsNIPr1ifL7oX5yBeN5uUWhsCtQGOeBjegzC5l5YDSm7GD wDJuz24YYuG0lfEttVADSaRMSSIW/oqob/29nVVAQCPErh5SXfgQFwFzszNO62Y8iVA6 /syw== X-Gm-Message-State: APjAAAXAKpr4sQ1xrqyuBz+sUngi0x6MYT5U0btqX6b1KJ4XMKWitz6m 6jGa30UjJdXlwyVw33u0lsf/A5XS X-Google-Smtp-Source: APXvYqz6XL5UesSgSW1uJvsBXCVcNpvCXtiffNlndZJh2wBgbylGAYFeG8P5aEwBdx8FkpDux74IVA== X-Received: by 2002:a1c:2344:: with SMTP id j65mr3013447wmj.38.1574252827946; Wed, 20 Nov 2019 04:27:07 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08e23.dynamic.kabel-deutschland.de. [188.192.142.35]) by smtp.gmail.com with ESMTPSA id a8sm6404462wme.11.2019.11.20.04.27.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Nov 2019 04:27:07 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 20 Nov 2019 13:26:59 +0100 Message-Id: <20191120122659.31154-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/matroskadec: Fix default value of BlockAddID 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 0d15c634ee..fb3f0a1917 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -707,7 +707,7 @@ static EbmlSyntax matroska_segments[] = { }; static EbmlSyntax matroska_blockmore[] = { - { MATROSKA_ID_BLOCKADDID, EBML_UINT, 0, offsetof(MatroskaBlock,additional_id) }, + { MATROSKA_ID_BLOCKADDID, EBML_UINT, 0, offsetof(MatroskaBlock,additional_id), { .u = 1 } }, { MATROSKA_ID_BLOCKADDITIONAL, EBML_BIN, 0, offsetof(MatroskaBlock,additional) }, CHILD_OF(matroska_blockadditions) };