From patchwork Sat May 8 12:29:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 27702 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp1368461iof; Sat, 8 May 2021 05:29:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwUhcYyWr0p/lPcBfuesS2o4UxtBkwsPRKwR8+GXEvD3Asz9HKjWiCK1v9PeZUhgNV51r30 X-Received: by 2002:a17:906:a0a:: with SMTP id w10mr15352767ejf.416.1620476998328; Sat, 08 May 2021 05:29:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620476998; cv=none; d=google.com; s=arc-20160816; b=GHDvqetxwua2b4BemQkhxZaxhuNHF+pU9I71K4+IwZhs9xeoh1WRU0bwFJY10/YI/d H5gPpmXLo0p4oMHvFeAy6EAupwS9He1MIHXt62IX/v8kdlKS86vv78D7GCxLkle1H4NR VQSn+42IlbWh3s2WnwmeEJakdsITC+2gw2WNphVr8I/sNsnv9YCBE0WYKzvl+eqD2FvB Uzg0HttMYTdEzacvRsurYR/FNB8vbpcjAAjZ+KmoFreRbaFAphyPvIDlVUSg/Q/gxgYM czxz+J5LlUIaFgPC+E9O/wdA2bq6dJ4RjhSR7asSGfGOZidt9brIPVkzdVU6blNM7AH4 yElw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=73jYmyDGe5RAYpx8gFUvJmrFOT8MmGQ3u6iWQDWaUw4=; b=GB1ERNh0eWZgwZsu0+pq14bBGLbvmEIR5TICNH/gdpD3cSflW4l3UvndQSkc/jpnOp mWv2s33itg/C8KJTu9yVVDmzKlQ7Yd5pzwtp5PaW+dPtMpL+LU/XlUO+orHKCqpGlb93 SOt/+4CP3YgvaeCOjI6oR+PnYtQum4tYqi3x1EXum547agFkDFOPqveHJiB3fenPcdXn lWF/SwNw+ktzQEa1jlghvlb8y8LJOmEWxG+liU2BDfvaJMSrn5JiJwDcIxMn2k/SujUC ppRZSYPEcdIigX/VB2qo4SkXjxB3QnBUvIlVu/fzNCjeKxTeJCuVa0k9HFZbbcqUeb5a eA2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=urw0+A7e; 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 g4si8222968ejj.279.2021.05.08.05.29.57; Sat, 08 May 2021 05:29:58 -0700 (PDT) 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=urw0+A7e; 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 AD646680126; Sat, 8 May 2021 15:29:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A71B66808A1 for ; Sat, 8 May 2021 15:29:47 +0300 (EEST) Received: by mail-lf1-f42.google.com with SMTP id z13so16639885lft.1 for ; Sat, 08 May 2021 05:29:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=bEXO/ZZOWiCEvxFxpPixMdGqE1D+Xcijw6g8rhwxybA=; b=urw0+A7etXgEtCVnjF9/Gmq9LPr1DTqRRcIX8l9sheQ7kJ/AUUi8HB09Hwoe1JwLt1 ke4z/g15N3yDPATtoNfm/isBrtZcqo7LpfCR0AWXPTTXHaxs86KLvVOa31BqIl9B0g9R 4joeAYatlkYMfKUEyYrzdgWSrxtKIBm9Z7174dH5ZRJBKKt171ddfgIhOAqnY7QHfQid sh0S3OBrDaN8GUoE2RY/VhVbWbApdOPLCB54OtXLROGOI56SYdXebtIhbN71GIPcW3BR 2TJLTE5YpZN4rU1UX9S9FxbjFy5FVnssu223MvbZk0ABDJwEA8NoBZI5mqovUBeup8II 7PNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bEXO/ZZOWiCEvxFxpPixMdGqE1D+Xcijw6g8rhwxybA=; b=rXmrBCaBugVuDPrh81ZT8NDk4gimQrTQdhmrrZrNjtSYT5KduNVEMa958dAiQlJ2/1 enCwx8oymprU7y8/y2PwtNyVvM3xlcqqdDwm1lnD0yUWqTo/ShE2YDwonavrLk08oPM5 7hB8JqLEy7+V22tkDMda694FCKnq5r/ceDVqsH5cVmEKUl3xHJG7g1fPxv1uNZA0P4JR 5qnceKcKfDxBZ/BwveDKRZ/fJA9XC9LVAsNdcksSIGXqRL0yIz3+MIq7MXkF1647s5ur adBRkmig3Y3UIHr7Jiq3Bqnamt+RyIdkg8I91QDnSYUzsVwpfPpfMTJp//hywwVPn9NQ pz4Q== X-Gm-Message-State: AOAM530Qt+N1znG+HKGW8L5tYtrvbMx3DS4XxyXgWglgL/AWQba8Z8gV jMUJh3lQKQPD7tevAgTqtBDCIlWQGG4= X-Received: by 2002:ac2:51ca:: with SMTP id u10mr9827253lfm.646.1620476986874; Sat, 08 May 2021 05:29:46 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id g15sm1638376lfj.197.2021.05.08.05.29.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 May 2021 05:29:46 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 May 2021 15:29:43 +0300 Message-Id: <20210508122943.15579-2-jeebjp@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210508122943.15579-1-jeebjp@gmail.com> References: <20210508122943.15579-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/matroskadec: remove special handling of av1c extradata 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xwMT+GDah9mN Libavcodec can now handle the standard AV1CodecConfigurationRecord extradata as-is. --- libavformat/matroskadec.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 8523261760..73e1ddb68d 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2720,10 +2720,6 @@ static int matroska_parse_tracks(AVFormatContext *s) /* we don't need any value stored in CodecPrivate. make sure that it's not exported as extradata. */ track->codec_priv.size = 0; - } else if (codec_id == AV_CODEC_ID_AV1 && track->codec_priv.size) { - /* For now, propagate only the OBUs, if any. Once libavcodec is - updated to handle isobmff style extradata this can be removed. */ - extradata_offset = 4; } track->codec_priv.size -= extradata_offset;