From patchwork Fri May 21 18:00:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 27911 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp746035iof; Fri, 21 May 2021 11:05:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzRIJ2lk/W8PJGegaZJIHAZLnMEvFWXVaWkormm27uTsLqAV7lQDFuvn5dJh9OjSJciWe0h X-Received: by 2002:a05:6402:188:: with SMTP id r8mr12416214edv.75.1621620321505; Fri, 21 May 2021 11:05:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621620321; cv=none; d=google.com; s=arc-20160816; b=reWezhmDePdlyIkCTKJpPhsd4oujmemRKtkbaQvhGZ9yEHUI3HZf0+m6eMGzZBxyc/ 0vZKjnqDcHtB2bst7WUDrjF/g2XS9OJQXtoOovPmIBvXjrEXBSU116QXSI7QiuU9wUDO IQ/9o8r4ChP/vV+zFAoiSJxGEaJ5jSFuivU1qLw/wMHHT0eub22jKM/BHnv2PQ7mUpQ/ DIy5h0JmPXX8nmeayEeLuPRw8yiY/lzr9AtBeUpA4ZaRTdE9bm7DJyFm6vpQd8mpIoJl K63PXuEERGASXEmQKS32YV0YGGaSTxLcCIPAB+HzONZdmCtskLTNVkf6lzP0pjkioSHa Fesw== 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:delivered-to; bh=vR2Dhrj6oGIM2uUdmOKChzxxM1tQ/dV12tXnT8pUfNw=; b=WO/GgBMhsSXiuIJMIefjGrMmE4ZcwcODAC7EFFhcjOHb79VYvKx7H9Y6aImTwE9PH0 2nudWXRdP/PQgocvUkPrQZlSaxdRQnKQwvwYePRrow53kXZPM4+LVwpDuz6GUHZeEQgm gHYxtmAeToHVc7rl0ye34vUgd9iAaKxNw8FE8/WE6NlpWGYq0zwoUrFIYch6Xzy0vpAT aApAhHJfBhVBhZwCK+snzC4HtU+Ek+udFOt5npGT6+vptLBnaAYVBB4S1LeVW/R5Kafh 63xIuCPYq7gAbDXTxQfW5bGCSiC6EZ7pi0XAsQQa0awWfER9i8AMOB121cVY8A3pEAs8 1OCg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id e20si5670310eds.560.2021.05.21.11.05.21; Fri, 21 May 2021 11:05:21 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8AE5F689F3A; Fri, 21 May 2021 21:01:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D0186881F1 for ; Fri, 21 May 2021 21:01:21 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id ECB3A24042A for ; Fri, 21 May 2021 20:01:20 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id MZWhuB3u3-pj for ; Fri, 21 May 2021 20:01:20 +0200 (CEST) Received: from libav.khirnov.net (unknown [IPv6:2a00:c500:561:201:5fb8:4bfe:b578:641e]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 34CED2406A6 for ; Fri, 21 May 2021 20:01:10 +0200 (CEST) Received: by libav.khirnov.net (Postfix, from userid 1000) id 2BA343A1908; Fri, 21 May 2021 20:01:07 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 21 May 2021 20:00:55 +0200 Message-Id: <20210521180056.17496-24-anton@khirnov.net> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210521180056.17496-1-anton@khirnov.net> References: <20210521180056.17496-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 24/25] lavc/mov_chan: avoid avcodec.h dependency 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: pWv4fJSNMh5l --- libavformat/mov_chan.c | 2 +- libavformat/mov_chan.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index 324dd5f913..4ec16f15c2 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -26,7 +26,7 @@ #include #include "libavutil/channel_layout.h" -#include "libavcodec/avcodec.h" +#include "libavcodec/codec_id.h" #include "mov_chan.h" /** diff --git a/libavformat/mov_chan.h b/libavformat/mov_chan.h index ca28345aef..978b8a3732 100644 --- a/libavformat/mov_chan.h +++ b/libavformat/mov_chan.h @@ -28,7 +28,7 @@ #include -#include "libavcodec/avcodec.h" +#include "libavcodec/codec_id.h" #include "avformat.h" /**