From patchwork Mon Jan 24 17:00:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 33795 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:e71a:0:0:0:0:0 with SMTP id b26csp495671ioh; Mon, 24 Jan 2022 09:01:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJwWs2xrQS2G79HGSg1u2APHhPQIgXgVDbCzhKRfN4nE2mG4ijWc9KzOl4pFrx2ScUvG0myJ X-Received: by 2002:a17:907:8a15:: with SMTP id sc21mr6084363ejc.312.1643043697276; Mon, 24 Jan 2022 09:01:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643043697; cv=none; d=google.com; s=arc-20160816; b=MhDbu6xuJ8Utl2fR31L7T83Olk3/WQ+P8i8uj6Q1cCbXislNcYsUbPHhs+n7lDbxM/ AuED0hUclq40ImFrPzl9mi3CwAaI+o1OEs/w9fIVnhTpjvFYHvFTVqPLl0NhKXTWJQWs Hp573Atd5U0AclFbxKcoB33hwwogXjGnuqxAU+esNWj/o60T9Wm730Qcz/G9Yplk8cbc WuQxdCdvgv3GKTW0ixa8dQqCnaXPY7FMq5Czc+tgRk3wV0fYkA9Ij8rJ2lbuPkEYSc6b GO8+rrJ6o1ET4uOWHg2+++5zoRr1F7+O2f8zhfPSIcXCqSiHZjpkzCOSx0UPkPYWFXdC hOig== 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=MbQXRqlSuMG4El5H67cuQH8h5WkIz1VouH1T8GpReIA=; b=X3TfXrRHdQBliFUs+tp2+H5VB0KVpeJ1npxEHS6uHKz7YZ0ZbSlCoGqbf+LpgMaeRA gj2Sryu82iKxJ+S7gwL9GCZR/KPZE8Fj5C5qYjyGf4Wza5DnR8JHOP4e6oq53UFIeQ1G WWqVb4+6hxyTihrAzWf68ud7Q1dF27lmYrTelyusELkguK4F/k1e/gbWKpA103jlokDH rVVWIhDwbZXrZHfczb6/2ZFoa87mftE6ST3R3P6PRgi91rXq+1zYGC8F07MBQFIiAG8D dar27g6HNbb/tVZ7roRo6PRhFbT9czRZwHu372xsaPbUtZPlMq5JdzEG/tqdAkApx/aJ yUPA== 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 2si8842649ejl.719.2022.01.24.09.01.36; Mon, 24 Jan 2022 09:01:37 -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; 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 121F968B160; Mon, 24 Jan 2022 19:00:44 +0200 (EET) 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 3535268B106 for ; Mon, 24 Jan 2022 19:00:36 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 71630240179 for ; Mon, 24 Jan 2022 18:00:33 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id sb_MLssWK8qU for ; Mon, 24 Jan 2022 18:00:33 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (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 17D0F240511 for ; Mon, 24 Jan 2022 18:00:30 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id ADBAB3A0702; Mon, 24 Jan 2022 18:00:26 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 18:00:10 +0100 Message-Id: <20220124170014.17189-9-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124170014.17189-1-anton@khirnov.net> References: <20220124170014.17189-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/13] lavc/h264_parse: stop including h264dec.h 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: pdf7Q2ToCYhn It is unnecessary and only files that are parts of the decoder (as opposed to standalone code called by the decoder) are allowed to include h264dec.h --- libavcodec/h264_parse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_parse.c b/libavcodec/h264_parse.c index 1c1d1c04b0..97ddf0e437 100644 --- a/libavcodec/h264_parse.c +++ b/libavcodec/h264_parse.c @@ -20,9 +20,11 @@ #include "get_bits.h" #include "golomb.h" #include "h264.h" -#include "h264dec.h" +#include "h264pred.h" #include "h264_parse.h" #include "h264_ps.h" +#include "h2645_parse.h" +#include "mpegutils.h" int ff_h264_pred_weight_table(GetBitContext *gb, const SPS *sps, const int *ref_count, int slice_type_nos,