From patchwork Wed Mar 27 11:18:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Diego Felix de Souza via ffmpeg-devel X-Patchwork-Id: 12488 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 DDBCD448EB8 for ; Wed, 27 Mar 2019 13:23:00 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CDBC068A964; Wed, 27 Mar 2019 13:23:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 590FE68A8DC for ; Wed, 27 Mar 2019 13:22:58 +0200 (EET) Received: by mail-wr1-f43.google.com with SMTP id h4so2448783wre.7 for ; Wed, 27 Mar 2019 04:22:58 -0700 (PDT) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=S7+y1lUC7t/FUpZgFo2SPXVtGXGZSyxDHs5ZO3CyoWg=; b=CWtJTatd11aafZbkWjDYIinwKsmMHubZz1WLo6UWt4YVxbBcijWNfIB9Bzl4I94gFf 2tY6OriQ2fgy9iHLlLqprbNBONpzLh5JPR7FMXDgeyKi9TQiHS60PLS+CP5fbLTGCOnQ xt5ZxIZzS9gGvk9S86nYUZc7lHHrZs3B65nRZNlnH0wsULuUuuD7MYXVNV79P9W9n3Df Am9Bi4c257BoC7ds2OvGOb3eDZyh5aA+FYfqXhLT2d0/ZFrRc9TVTDlipA0Q8OhTBewA 9/vrI6rT1mD2MppoES/767w710aelp8PJYY8zDwRCRt2unTTQROIWBITzrYV47nKiTMg 2X2w== X-Gm-Message-State: APjAAAU4pWUjVaRCi56DZ1C/c6t+pPf7R3glNkoQarHbZwnXCj9Lr9rK 623neQEAjV44rjF9ipEfSscDa7kPPWo= X-Google-Smtp-Source: APXvYqyxaEDf07SPtHvFmYWSzyJbDWBmKnF3uSBqgzg+D1mtr1vckbEPC/YZ/AcR8b1LpYrSNEYMeg== X-Received: by 2002:adf:9f54:: with SMTP id f20mr23663369wrg.88.1553685777804; Wed, 27 Mar 2019 04:22:57 -0700 (PDT) Received: from localhost.localdomain (ipbcc08c44.dynamic.kabel-deutschland.de. [188.192.140.68]) by smtp.googlemail.com with ESMTPSA id h10sm31745448wrs.27.2019.03.27.04.22.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Mar 2019 04:22:57 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Mar 2019 12:18:50 +0100 Message-Id: <20190327111852.3784-20-andreas.rheinhardt@googlemail.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190327111852.3784-1-andreas.rheinhardt@googlemail.com> References: <20190308092604.3752-1-andreas.rheinhardt@googlemail.com> <20190327111852.3784-1-andreas.rheinhardt@googlemail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 19/21] avformat/matroskadec: Add SilentTracks to cluster syntax 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: , X-Patchwork-Original-From: Andreas Rheinhardt via ffmpeg-devel From: Diego Felix de Souza via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt , robux4@ycbcr.xyz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This is important as unknown-sized elements end upon encountering an unknown EBML ID. Signed-off-by: Andreas Rheinhardt --- libavformat/matroska.h | 1 + libavformat/matroskadec.c | 1 + 2 files changed, 2 insertions(+) diff --git a/libavformat/matroska.h b/libavformat/matroska.h index 86968a8de1..43fea595b6 100644 --- a/libavformat/matroska.h +++ b/libavformat/matroska.h @@ -224,6 +224,7 @@ #define MATROSKA_ID_CLUSTERTIMECODE 0xE7 #define MATROSKA_ID_CLUSTERPOSITION 0xA7 #define MATROSKA_ID_CLUSTERPREVSIZE 0xAB +#define MATROSKA_ID_SILENTTRACKS 0x5854 #define MATROSKA_ID_BLOCKGROUP 0xA0 #define MATROSKA_ID_BLOCKADDITIONS 0x75A1 #define MATROSKA_ID_BLOCKMORE 0xA6 diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 60f58cefa9..c1feb3f0a1 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -711,6 +711,7 @@ static const EbmlSyntax matroska_cluster_parsing[] = { { MATROSKA_ID_BLOCKGROUP, EBML_STOP }, { MATROSKA_ID_CLUSTERPOSITION, EBML_NONE }, { MATROSKA_ID_CLUSTERPREVSIZE, EBML_NONE }, + { MATROSKA_ID_SILENTTRACKS, EBML_NONE }, { 0 } };