From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2E36645C69 for ; Thu, 30 Mar 2023 02:05:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9098768C3E1; Thu, 30 Mar 2023 05:05:25 +0300 (EEST) Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C4CB168C3DF for ; Thu, 30 Mar 2023 05:05:19 +0300 (EEST) Received: by mail-ot1-f46.google.com with SMTP id q23-20020a05683031b700b006a1370e214aso6419016ots.11 for ; Wed, 29 Mar 2023 19:05:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680141918; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jmXZKrvngr2t+2JZnN9fgsmnn+txxCJ0hiCI/9/QX/c=; b=UZzMhMSl/oFBoskvd6x7IhVUwkhXRYbUHelxdXAbbb0ZKg/RX1g9wEyT/uTCRZxnC1 e3b2Fbdk5jv13Nk57P/JoGYSyNggg7C/60mkXesOwN6qWzeuNsP1Zt6P+dohA/3+i4/0 FAMoVH7iaub8ycQsHQfS7yG05vip/CKHfPr0yZ3ab1k0lPKaz3hXeBKNVBCucx0D9S/D wPofY7puY6V4cWlFOxG4nQnIgFf7xImKbo0vvg+A8VyAIrrCQ2U+hlCwMC3PqhAOxNF9 YmYafzk5nGwoRmV4YC6edCF1QRTjDudLZK7XXv5SvXviJyZqYwO2TPFdk8J1SGKYrhSA a9IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680141918; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jmXZKrvngr2t+2JZnN9fgsmnn+txxCJ0hiCI/9/QX/c=; b=jYZEAjZ+ZWFg4S+Lho+ZYC5ZxiYqD4fkVg/w5xnBSWGAiFKZjLi4Srh/KsPKqQ6wyu abbqKeXhXfzYI7NK8igxNNbk6KeJWVAS5lFzQkCwVK3r0Cbjy+Wfud+XLeg3k2cXu8eU R1fEDdgiMFpuQldN4hR+WwiLqWJ4qheatxB5V0b/zvjPc9/BjiLFiFAIUqIQCtjfwDja w0P83PvvUE67pKtJgsDUTb7bPCLf1MT8C2keq5C0bxasw7lFs7eXNjGWSBehbLqOZHcD i2NiiVl1LwjkWCHnUUgThztiJerUCjuvy46pRJkFUvSTBHZFEZE2LODzAZxJk8iwCZeV Ykrg== X-Gm-Message-State: AAQBX9dKI6zSvEbSeYJFTUjCVfqk9m4PEbeg4Rb5OkdM9rplImvAfvab RgVfvgbbTXnfne6n6CoazTKzkf8Mpz0= X-Google-Smtp-Source: AKy350aHQ7Khj4S9yPMfp5o0Zf3yJrgbCNx0ISgIEB6y/8ljvGtLUI9Q24QFLuy8tr/HDBjVzL8kDA== X-Received: by 2002:a05:6830:571:b0:6a1:2a17:16f2 with SMTP id f17-20020a056830057100b006a12a1716f2mr2023029otc.1.1680141918146; Wed, 29 Mar 2023 19:05:18 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id f23-20020a9d5e97000000b00684152e9ff2sm14221540otl.0.2023.03.29.19.05.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Mar 2023 19:05:17 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Mar 2023 23:04:43 -0300 Message-Id: <20230330020448.9146-2-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230330020448.9146-1-jamrial@gmail.com> References: <20230330020448.9146-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/7] avformat/matroskadec: set the default value for BlockAddIDType X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- No changes since v2. libavformat/matroska.h | 4 ++++ libavformat/matroskadec.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 45077ed33f..de63cdc7ae 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -358,6 +358,10 @@ typedef enum { MATROSKA_VIDEO_PROJECTION_TYPE_MESH = 3, } MatroskaVideoProjectionType; +typedef enum { + MATROSKA_BLOCK_ADD_ID_TYPE_DEFAULT = 0, +} MatroskaBlockAddIDType; + /* * Matroska Codec IDs, strings */ diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index b7f9870f3d..a19b97043c 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -591,7 +591,7 @@ static EbmlSyntax matroska_track_operation[] = { static EbmlSyntax matroska_block_addition_mapping[] = { { MATROSKA_ID_BLKADDIDVALUE, EBML_UINT, 0, 0, offsetof(MatroskaBlockAdditionMapping, value) }, { MATROSKA_ID_BLKADDIDNAME, EBML_STR, 0, 0, offsetof(MatroskaBlockAdditionMapping, name) }, - { MATROSKA_ID_BLKADDIDTYPE, EBML_UINT, 0, 0, offsetof(MatroskaBlockAdditionMapping, type) }, + { MATROSKA_ID_BLKADDIDTYPE, EBML_UINT, 0, 0, offsetof(MatroskaBlockAdditionMapping, type), { .u = MATROSKA_BLOCK_ADD_ID_TYPE_DEFAULT } }, { MATROSKA_ID_BLKADDIDEXTRADATA, EBML_BIN, 0, 0, offsetof(MatroskaBlockAdditionMapping, extradata) }, CHILD_OF(matroska_track) }; -- 2.40.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".