From patchwork Mon Nov 23 19:10:46 2020 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: 23980 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 34B6C44A18E for ; Mon, 23 Nov 2020 21:17:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1880E68BB90; Mon, 23 Nov 2020 21:17:38 +0200 (EET) 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 EAD2F68B8D9 for ; Mon, 23 Nov 2020 21:17:31 +0200 (EET) Received: by mail-lf1-f42.google.com with SMTP id t6so9208812lfl.13 for ; Mon, 23 Nov 2020 11:17:31 -0800 (PST) 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=u4ywVsguUaNvvYxSl559bqleevJX31909sx2vB7CcD0=; b=Aoek48Q45YjYUycHyo9iZkeXRwytx+Oxw0scyKHt9IejBZx6B4JKOq9S0ZGOCF/+rp Z8M1MU92YMPv3xx4s8XzG0H/gco4syE4xNM7NibEfPar+LRtDQktEa3E+7SkGqikdSJf +lAUORBh6iNxIV0rfvgckd3LOBfjaXgcqOZ8FTFgzMTdYmiShZdWyDxw5rr6z8JeeeCY bgVadzU1sVn26IlGLaVkIHcEeIhPUwRK4K3+bjVO52Wo+RQ41LlIt8IXjlOB+bOWw4jP 0ZXIfTbX4FqVE5lEjneWwVAooocUGNYMiW9AOcOnXCzdccsyB6jwfYB1BNRRuznhUY0a O3DQ== 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=u4ywVsguUaNvvYxSl559bqleevJX31909sx2vB7CcD0=; b=gatNzqYzzF7a/kSqsM3zt5tJOTIs+eOk7obddPDzO5zBHiqnK1uS/Lbhoxk22C8fpL oVtSgCZSn+1h1ZW6+EzDP0UQk9G0zXLhY/J3saBUq/hwXofal0bfEmwGAfMDiOuBRk3Q kwgEkF6OBmqGGuGPbVZotKg6qnSXK9/vEZNpnk2hIFQyfpvz7hy0PkfubOhaDRozZZzx tA6drzV+6zig/S1iza5nnbhwzZT76jyV6xcBbYU7hT5euu04aroMbxpXrSjINJYQb4T0 eyWn8ib5QHaBjY/2X6GDRKfOnTBPr2Oow3raz49APxJSuR483Pk23kwVsKKeZ1UMTnsE aqnQ== X-Gm-Message-State: AOAM530fXcngEQX22xNGvk8z5aev5iJ9p1uZ5rbTFoN82Wf1sdWiG0To Ex47eoaHW6J0Xw4mcm4faNq7yq3c2rk2cg== X-Google-Smtp-Source: ABdhPJzfmIW3UELvDSggsH8S8NsAdHUc3dMQObH6pO4uRGOBZ2+EqkTRt+EY7FSHn351if45kmZ2+g== X-Received: by 2002:a19:ecf:: with SMTP id 198mr227815lfo.193.1606158659242; Mon, 23 Nov 2020 11:10:59 -0800 (PST) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id j19sm1469995lfb.29.2020.11.23.11.10.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Nov 2020 11:10:58 -0800 (PST) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Nov 2020 21:10:46 +0200 Message-Id: <20201123191046.28887-7-jeebjp@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201123191046.28887-1-jeebjp@gmail.com> References: <20201123191046.28887-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] avformat/matroskadec: remove special handling of av1c extradata 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" 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 44db2c8358..da0fadd47a 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2661,10 +2661,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;