From patchwork Mon Jan 24 17:00:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 33808 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:e71a:0:0:0:0:0 with SMTP id b26csp497121ioh; Mon, 24 Jan 2022 09:03:01 -0800 (PST) X-Google-Smtp-Source: ABdhPJyOjT3EI72Gg2rjvjRLBJfT1pk3COo6CWBSR6X+an2tBJbQMhkIw9+EEc2lFZ8+1QnWYqQF X-Received: by 2002:a17:906:4fd1:: with SMTP id i17mr13633423ejw.656.1643043780329; Mon, 24 Jan 2022 09:03:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643043780; cv=none; d=google.com; s=arc-20160816; b=RF7/eegenGXFKoYhsT3q2oSL4OgaAwo7qClaEhI07dP8mirZspaNYyJrlmRKkH5qUl mdXzJYLYjoSDXhaHxALcNfze8kilkxaV42UzOsa22DqrxevmBXRtCmkcez0ss2wdzTFg iW/VwJk3+piaiqWKN39Epp/c7qfWlj3tCe/bnEETs2wub2rALNjMdBPy3vxX1yB4LScp zfcuj3mdyzR4RpmedyjtlXDuIvNdVb6+ifBFOD23Qzp57/QZgA4HrC5lpMLwSdy9WY7c opEytvlNMUNEt/SglsHslaNcZcbOXo4+IUvzZvyfhdIn93BUL7XX0k9aGELR3oc7zujl 1mTw== 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=KOpCt5FiqpIjjnGnA+9XJ+BZSKEU/2f2GyBYypB1Ev4=; b=LdpgVZeUEtntbPAtEg5SQFcthxRvQY3WPFi043Np5K9wznN70zhmjd9OgSLRnBvK5/ UMAkeqVsQZ5GCwhwu40zjDyoZudrsdKLz6SNps0+DgO23L0pRnuHzhwQTHReqGgUpww4 /2UtlFpqdUVU8d0NqYgQDvuS4JBW0ChMOJVtGhanNmnxwjP5sGaESX1c7gF4TGp+2fLa 2TMErs4Q6Ddrbcq88U6HdP90Rs3M5aFwppAWxq9JwGMCAZvU4uL8JaCW8Hby+rI5kXXH H9R1UEDcrlasPGFarsc243J99koLQIz6zRmdD9HsY57oe+ZCZnLTHOaBnK8/DEFBkGO5 VEBQ== 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 sa39si5422331ejc.693.2022.01.24.09.02.59; Mon, 24 Jan 2022 09:03:00 -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 CFCBE68B1AD; Mon, 24 Jan 2022 19:00:49 +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 DE6C368B149 for ; Mon, 24 Jan 2022 19:00:37 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 3CE2424017E for ; Mon, 24 Jan 2022 18:00:36 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 7pVMIbogsuCy for ; Mon, 24 Jan 2022 18:00:35 +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 30BE224056A for ; Mon, 24 Jan 2022 18:00:30 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id BBB6D3A07AE; Mon, 24 Jan 2022 18:00:26 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 18:00:14 +0100 Message-Id: <20220124170014.17189-13-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 13/13] lavc/svq3: 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: +b27Gsbna4xg The only thing that is actually used directly from there is the PART_NOT_AVAILABLE constant, which can be trivially copied to svq3 decoder itself. Otherwise it only depends on other indirectly included headers. --- libavcodec/svq3.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index a3f434ff8d..f06404da9d 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -49,13 +49,16 @@ #include "internal.h" #include "avcodec.h" #include "mpegutils.h" -#include "h264dec.h" #include "h264data.h" +#include "h264dsp.h" +#include "h264pred.h" +#include "h264_parse.h" #include "golomb.h" #include "hpeldsp.h" #include "mathops.h" #include "rectangle.h" #include "tpeldsp.h" +#include "videodsp.h" #if CONFIG_ZLIB #include @@ -63,6 +66,8 @@ #include "svq1.h" +#define PART_NOT_AVAILABLE -2 + /** * @file * svq3 decoder.