From patchwork Mon Jan 24 20:09:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33827 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp16090iov; Mon, 24 Jan 2022 12:11:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJwmuP+WwJHGy7WiLeM02YmxCzqJp49zisKW4+jAgrkFuXlAsRvmQOaHAHlNiW3s1+9zJtf2 X-Received: by 2002:a17:907:8a15:: with SMTP id sc21mr6625273ejc.312.1643055119306; Mon, 24 Jan 2022 12:11:59 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hz5si9655528ejc.205.2022.01.24.12.11.58; Mon, 24 Jan 2022 12:11:59 -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=@outlook.com header.s=selector1 header.b=oMGLsUog; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E8DEE68B1F8; Mon, 24 Jan 2022 22:10:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069036.outbound.protection.outlook.com [40.92.69.36]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A53FC68B1AF for ; Mon, 24 Jan 2022 22:10:07 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ExWciepWwIF2iE/Hw+i08QgERi/vbj/Dcoq+yf2Xut4vjoYBi+Vd8ey4oVYkl/7pyeV+AcDMKsM50AOGlMdK5AcySc2he45fernwgm+sq2Eo2SsgbmZABjIFQcqJxAAmgtyJz4VHeciAXci/liwEpRlnh0ftqortfvnCxFWdIyCL2fY5/VNpqRxHCk5eaZw8jSxdhzZRL3/5tnWSNOb+sl7pphc62WauKrgYJcukI0L8Qtk2b+Ni45/ATgikYEZtN5l48RfMYcSfw3fEW7+hwpvuRICQlxz8W5Umj4jxa/APILNN96Mw/wFdE75t31hv55eNPwuWDgXEYPIQTNKLhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=e3iOUsyj/eEaVVErgsm4CtXat9rxTvNG28dA2N13cnE=; b=ZiJBOWc68pfdyO7pOTubS6lsoKgKyrlv1SfsyL7jwaAZy6xSJ0nOW2pljLBOfv/F0DY9RP3vJU+fbtfzG9jWgwHmbYnKLs7VA7rBKSH7uF4rCDrBy/MG25ck1OEwjFS4NjyYS5aY2Hdg9NcwrSl5M8GII8u+4ZhqvRAL2/O2NMWpcYNxi8A3W4O8sqw8aahM8ykhgWG5ZuE4JKb3CX1Qy6M8a2OY9PWzxZ1WAcypCb+CoNsO5t8Rxv2E6SCuioSIYhRvB6vqdijRssvHOas4/rbCKaVy8dnSpQRCxFhq6b+XZcs28oc5pKxdJIzKdOZXW+YztDiCK79NnA1CeGny1A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=e3iOUsyj/eEaVVErgsm4CtXat9rxTvNG28dA2N13cnE=; b=oMGLsUogE7eQn6Bm/psjHi2fjkznIO2TzG67szt7CqR9SgA6elcjvbkRAXSGYnqST943WQyBd+/tnT+wjsoRDxX2RbwMW5YrkoBc81iaGVBvfbywqQJxGUJun2TsHBEPBUpeyZ/NT6LCEFkcbtrK18WhtPiVnF+a5EutaD1vvFr7TPVaY1dFGlZ6gL1rN5jrM+LKaCGx728nNTzjFLLLT39pyMlik6ZixH3N7Pxk26g0av7fLCrf1ipGZzJymF1cKB0BaIkL3YgZN80NUuV8x9bQA0lGEdt+RsSpTRpmev75suS1cvpR1XiOimgKDmlbNqHIiJ3PLMtP/xLi37kn3g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by DBBPR03MB5368.eurprd03.prod.outlook.com (2603:10a6:10:d6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 20:10:06 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 20:10:06 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 21:09:27 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> References: <20220124200931.593079-1-andreas.rheinhardt@outlook.com> X-TMN: [TuI0FlvBtTAqchbWYdeZDaHLjXNf52jF] X-ClientProxiedBy: AS8PR04CA0012.eurprd04.prod.outlook.com (2603:10a6:20b:310::17) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124200931.593079-13-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3d716da4-2def-4746-96cc-08d9df7583b4 X-MS-TrafficTypeDiagnostic: DBBPR03MB5368:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5McoFJ/NKNkpTMzpE4PNfPlKZ39E7xD9OmOLgR5Qm8oUmKN2TONdUmkXTNd9nzTsPLQVsNUQMXqeLW4hbj2mKhBNdzq3iIsxn+wkepZya7Mr1kfa0pYpmXrUfA3Svlv54n7V8ni2m6iqdGG2jhkBQucrVhyi7x7muCNxWvsYRFaPfTAclETtmB8nxI3Wo3W+JaChtdXNK2ZcM3qTAc8+09k/LiiN6xCjlB+JlNQP8Y2w0VjtDz888ghotFv4lS5maa7YKX4+9yB9H8bbXPQUasLSWovhLKHknnznaaCwOGyV9jHkhOz6TeFPqYGWPKS2Lr1bwt7mS5pE6Fvi5wOjmkGh/vJsAQ3NWkD9yJZFw5Iz2keo4OH9ybSRzC9v0Omo1xeOnQEVXWhD5JlM51S7sjw92d/1RsLJER+iFP5HfuKMKkXEbdaX7qCa7CFSFQb1SL9GkyB5PNUHqW15xIvmh/AUkPC5awCdr5ycYRe4JoQS7TeozC8aEbTEB+IPrXd2J6NOJCPIBN5KSSIr7ZeZYUrOuSMwoP5U/V030kFitqSgaDt4l14Lm0zNzMw2LVpHWAZAeOK8Ogh6X0GivnE4qw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ecWcKkrWat35Z2pMZaBKXwQaQjHuEk5hpzToSXyLMdLpFDtWIl3ynee682hFG32ejC4fMimKABuUorIMR7fhRUmBDxR+2/9iO/oFL9SUzYgTVvbNtjuk919Zd34xql3cmy+GzyFiQ8bnVrH3+xzgh4zdcp3m9FGTK2pWLdpNECsX0pr5HcrIKeD9q1P8eVD2+aRLSEFEV1kedReht4Ja22IwJmXqNNPGGOzU6A/o7i8seaE7/YCD5n3jRze0k+WnWyAgTzKuG5z+Kovpf1JQH5KdXW7kWFwC7+l+vjzNEJ4d9Fp27ymCb8Ja1pOFP6HUmK4CIJynmjYdpEz8P5nGI0KoSI9eNCvfMpmPgRPPNQSR4LrCRPNgsJri1mQFfvmrM2CDDBaD5+0LYMmjsAaRxr37gkYaw1waHx6OO9L/0dl/eBLMixLUeErGIWeYcTO7vpbKSU7hp1yCeA5t9MsHacDYLLItivExjBCJdvhFg7kCPwuFR8n2ie1a82LGpEd9dBjP++6XloJlANP4OiDAGdh6CtkCZRSnG0FkPdMRFoLnhWfg8AYZioFncQN9tzoNs4mb25xi+8K3kC4BQAx9JJmzMahEOpMy7eiyKA5C7ddZOzUDRBM4hZ2MLlcManIZF7hcynDtCAThqPpHtSuC9dhObg2NPXrng4gN4sMpE6ziFSUGVqjPBY++xTiEZ1cuitI6LnJQQUvf8em/aNE7jrZo3mhB5R0ViKLHRju65xkI9+j7tlTf4Mrs0AaO2sMukTZUVWc9GNtG49GpH3JADjjgdixCjJuPy8/XVbq6mbfO5b9e4s+YL60cW+rzyDYan44wa2FGA3ppXhKh0jDYwLnJXbzY8hWAKmEcy3StsNv2lAADduEOI7hCtCFdFDj/CtII+uxemLLpzk49PMDJ3RSTQ3/k2glRw33WqlVkJPlmv0EdzYziM1wOP46BcfUVoea9VFC5P1UWrgEOxbHitA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d716da4-2def-4746-96cc-08d9df7583b4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 20:10:06.5484 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR03MB5368 Subject: [FFmpeg-devel] [PATCH v2 14/18] 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 Cc: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9McrCtP9nsAv From: Anton Khirnov 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.