From patchwork Tue Nov 8 19:48:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?5o+a5biG6LW36Iiq?= X-Patchwork-Id: 39238 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp3051672pzb; Tue, 8 Nov 2022 11:49:04 -0800 (PST) X-Google-Smtp-Source: AMsMyM5T7dwoRrrBIOJV84NKhGp556iYRacs51oIXGUvb91geD2OXx8agrf6KmE/FaaKyjgGmKMJ X-Received: by 2002:a17:907:2d11:b0:7ae:38b3:b56c with SMTP id gs17-20020a1709072d1100b007ae38b3b56cmr21758008ejc.195.1667936944275; Tue, 08 Nov 2022 11:49:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1667936944; cv=none; d=google.com; s=arc-20160816; b=V5SMgdSyyugZMgRSMoSdDWG5nS1SZyjEJTB8c3gJPP6QlnLxpE3x0KFE0NuXpcp+tX I3SW3puzYAdiAN7bXbAYrP5K7d4NVzMHdFIXl70plfGlLaQUkKQnKt7AsmBthPueqjKw a/vuXCI7xodpie9z1IwaHbewVxjfITGwx3STASr8d5esRvei28ZhyLxTRYjlsQkZrlTP EO7kyaeu7wtYN52I5Pr0fPPJYI4/mBfimwaRRufemnysjoOqA3U0rwyfHrJAr8cwhuUY 9M+QnNuBf2rX1EE3WzLAMwZU1ZIYw7ojw/bqX1WjHZlXdYnK50GcdPrs/7IaQF62Ace7 sPLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=P8xEnQK7BhRKvM+sYP2f9XGyhY7AlwQoMUc7/MP0PMg=; b=gC47GKwCBJMqpR4qcnfIgHAffFtY1NmlwSz3lx3bL1+r/o+yZxwRTm0me5QjASXRWu DIH0XDNJhLqfeKMPevNYH4BjIpfz87p3FZAJJKAV+sbg4njkx1ToVIKqWL+f2BWO9Yw/ 0D+puE5wiKDCIQvx58rEsC6SX95gwJUjAEXt2nERgfBofE3j1Z+p3pktSvgylOUPAkXJ 0/HRqo4MJtSJtkkuNiJQY5dfGXoCE0i/pqgq/DeXviOHb072baD5iM7FbpqzvDvfRROs nlKNw6voHeofVEHIaCPNNabio9WkBWMeBa7FELYrDNl55VNxdxJ0fLsWLoMf/zQWA3hp VLtw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="n/MCv0eN"; 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 v17-20020aa7d811000000b00461e122a4e4si11084933edq.314.2022.11.08.11.49.02; Tue, 08 Nov 2022 11:49:04 -0800 (PST) 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=20210112 header.b="n/MCv0eN"; 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 5091968BB2B; Tue, 8 Nov 2022 21:48:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 908CD68BB2B for ; Tue, 8 Nov 2022 21:48:52 +0200 (EET) Received: by mail-lj1-f177.google.com with SMTP id c25so22665999ljr.8 for ; Tue, 08 Nov 2022 11:48:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=tKYQy9P+fO5TPcs7AFcL2+ZyjIj8b9AxQrqPUoo3sII=; b=n/MCv0eNNFXVzA58266N/xHEkXsGbeDwZFylNIfvxXkqVp6n+zoJus7kM1niHvjuUH V5fu/SrFWgGso30qe5IVxOHuRfG8niUI/Dvt+TMFmFz4rSsW8Yo4ObESKMrjF7ts7MII 0FTTCkDKw0d7z42LPsu1HQyVSDMy0Gqg01brw1hRHvxHiADoWCX9VUHGErxl27c6c/go t1188FH1VmfkbNXf3aeuTRXmoFyEmQMruSMSAOhZ9ibNnVnoyfMW8x4ZaTiUhFGI07e9 fmuKFVW1CyO1iY6jfHzIw0efEFKBzmpli0N1yXMT5yttKxPmhzB1R2NrUEhKqTQWZvIl z8wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=tKYQy9P+fO5TPcs7AFcL2+ZyjIj8b9AxQrqPUoo3sII=; b=L0VPCEub4BQ94J+TK6o+sYvxOLf4AMR995DW2GLdb7W0TaFw4EAdMC0N9e62DmeHR1 f1Px1oByNirp7vqRZ1r7mrM5XbEPkaklEdgeNLgGCPO1Ey1U3Q6PNNn+Y326qYZOisLa 1/BFnJoJCOAlS2jf2HmcHVgky0pbF5i8t26oTMB3Xo5TobkKxiygmisixxOdEUUamR3u HeXO5EnVDodJpi+Z2rIEe0jAlmkpqP+dRHquL4WQHqj9F/YZ+UU65F39sAqo64kNwSG8 cR/Opys+VrekAZdgY63tC5M7+N/r2LYOYJsR9g29AveyG3b6k3TqpVixkjKTBMXmumD+ gdnQ== X-Gm-Message-State: ACrzQf3Je9NBnUSAtni+vDcQU3thnITSJ8v7eZ2ZspZ/r3b0HJUVOD6q DdZYrKEE+vOfQrANM5ALwO4IMvKtkBY0CQM6P9U= X-Received: by 2002:a2e:894c:0:b0:277:1e3e:fbc8 with SMTP id b12-20020a2e894c000000b002771e3efbc8mr18898162ljk.301.1667936929205; Tue, 08 Nov 2022 11:48:49 -0800 (PST) Received: from localhost.localdomain (static.243.118.217.95.clients.your-server.de. [95.217.118.243]) by smtp.gmail.com with ESMTPSA id j29-20020a056512029d00b004ac980a1ba1sm1909245lfp.24.2022.11.08.11.48.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Nov 2022 11:48:48 -0800 (PST) From: uioptt24@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Nov 2022 11:48:36 -0800 Message-Id: <20221108194836.1919-1-uioptt24@gmail.com> X-Mailer: git-send-email 2.38.1.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat: fix use of undeclared identifier error when compiling Chromium 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 Cc: gz83 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jlPnLAwhyt8H From: gz83 Cross-compiling Chromium on Ubuntu 22.04 will encounter errors related to avformat, because Chromium regularly synchronizes upstream changes, so now submit code directly to upstream --- libavformat/flac_picture.c | 3 ++- libavformat/matroskadec.c | 10 +++++----- libavformat/mov.c | 11 ++++++----- libavformat/oggdec.c | 1 + libavformat/riff.c | 1 + 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/libavformat/flac_picture.c b/libavformat/flac_picture.c index b33fee75b4..36d190fdc7 100644 --- a/libavformat/flac_picture.c +++ b/libavformat/flac_picture.c @@ -19,9 +19,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/intreadwrite.h" #include "libavcodec/bytestream.h" +#include "libavcodec/defs.h" #include "libavcodec/png.h" +#include "libavutil/intreadwrite.h" #include "avformat.h" #include "demux.h" #include "flac_picture.h" diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index d582f566a2..f7bb962941 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -34,6 +34,11 @@ #include #include +#include "libavcodec/bytestream.h" +#include "libavcodec/defs.h" +#include "libavcodec/flac.h" +#include "libavcodec/mpeg4audio.h" +#include "libavcodec/packet_internal.h" #include "libavutil/avstring.h" #include "libavutil/base64.h" #include "libavutil/bprint.h" @@ -50,11 +55,6 @@ #include "libavutil/time_internal.h" #include "libavutil/spherical.h" -#include "libavcodec/bytestream.h" -#include "libavcodec/flac.h" -#include "libavcodec/mpeg4audio.h" -#include "libavcodec/packet_internal.h" - #include "avformat.h" #include "avio_internal.h" #include "demux.h" diff --git a/libavformat/mov.c b/libavformat/mov.c index 1f436e21d6..39d2c71edb 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -29,6 +29,12 @@ #include #include +#include "libavcodec/ac3tab.h" +#include "libavcodec/defs.h" +#include "libavcodec/flac.h" +#include "libavcodec/hevc.h" +#include "libavcodec/mpegaudiodecheader.h" +#include "libavcodec/mlp_parse.h" #include "libavutil/attributes.h" #include "libavutil/bprint.h" #include "libavutil/channel_layout.h" @@ -49,11 +55,6 @@ #include "libavutil/stereo3d.h" #include "libavutil/timecode.h" #include "libavutil/uuid.h" -#include "libavcodec/ac3tab.h" -#include "libavcodec/flac.h" -#include "libavcodec/hevc.h" -#include "libavcodec/mpegaudiodecheader.h" -#include "libavcodec/mlp_parse.h" #include "avformat.h" #include "internal.h" #include "avio_internal.h" diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c index 3b19e0bd89..c4321a9436 100644 --- a/libavformat/oggdec.c +++ b/libavformat/oggdec.c @@ -29,6 +29,7 @@ */ #include +#include "libavcodec/defs.h" #include "libavutil/avassert.h" #include "libavutil/intreadwrite.h" #include "avio_internal.h" diff --git a/libavformat/riff.c b/libavformat/riff.c index 7319406b39..b1cac3171b 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -22,6 +22,7 @@ #include #include "config.h" #include "config_components.h" +#include "libavcodec/codec_id.h" #include "libavutil/macros.h" #include "avformat.h" #include "internal.h"