From patchwork Mon Jan 10 17:51:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33188 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp2949349iog; Mon, 10 Jan 2022 09:52:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJwgdA0dWGBtAuJDFgnbQTCwr4wChwoXoJESLAlelOnt99iRnPgp6g4iNDZ8kx7AIH9L2HMx X-Received: by 2002:a05:6402:154:: with SMTP id s20mr801554edu.148.1641837152990; Mon, 10 Jan 2022 09:52:32 -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 e1si3300360ejs.857.2022.01.10.09.52.32; Mon, 10 Jan 2022 09:52:32 -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=k3EEEFU9; 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 DEC7468AF07; Mon, 10 Jan 2022 19:52:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2075.outbound.protection.outlook.com [40.92.89.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F7D268A199 for ; Mon, 10 Jan 2022 19:52:00 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dt1u4dlfCqMcs9Dlp/b6xwI/DLPmTR0gI8LR6yuE4T+5t0bAa0KzHDc7zhpcwFdJIZVREWU0HO/gUlNoVYKL5L5pojaW/rm1XW/qTyg12wQCkiUNtAn56pbaIyq8DOqLkyT/LIe0TnGtJqA9GXQrVqC7BtWPuMd2sfOb3verQ3uPw6OclmI5XppfGStoV5CngEyOHWDlWTuDOsOWuONnBsHjTY9s7VBtnqF3q9h9jeDx7mCywNrd6Ri6+myL6OQcxFrrAiI7YukQB1++HcygnseHbgqnW2h35wNT6NN10YEoX2nGNe3A7u3cyjZPmEwI7m3TdxjG27JTeDRxdDB58A== 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=Xb3QcCrqEd+W9VUlRWaJSxXo19y/7ig9qfqAcA2TlqU=; b=UHpD+xCO89nvJxd4iuniZwrMEHnKvfLWvSvG73TC8V0lRbvxAVBK01XqgzxWvxp1jhO1sARttse9CsyyAPx6ISjzYMYssRXDQ4BDaI7/2Jia/GRBZS8IJzSQdj7rZ9qOjh/+giIP4FYwceG7/0lT+LYZMSVQa8mlse1ZtyrNdrN1xQSTY5IMXfqQ8XQR8mrXBm8LDYd6Crc5OKaf3uIR+45Bdbf+KV3YgvlLQv3JczMNOlgoQwLhfkEj9cdklIW6wDz7niTSH0qz44AfNNQTIBHVQZNjqhmK9TguXSvEXxPPz+OXdvwcDJ37cdgaHvvF71il0sgeGWa64CP/DxecBQ== 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=Xb3QcCrqEd+W9VUlRWaJSxXo19y/7ig9qfqAcA2TlqU=; b=k3EEEFU9iRotMxaoj+yj62oLKn3L9Le3fFYFuPTHIqoVWW34fNQKIIl1PhlZT4Rlr8XkGuCIDUDFRHhmjczo8xOfH5jCRP0PfoaRbiguFh3UU4LqbWXDy7iltn1rZyx2Mc7q8G7dHQ+ybiIZR43rxYKkha7hvMwv0QltnjC6umsKNsmaoSQ4aZVPS/kSuck2q4ACcu1/DOjIubYc+3+4hYCDFxnDHoL/X2laZmgh6S/5gLPejwV7IFgvbN3ymzEl9Nb/XMRd7t2Tf/6A95c27qFLsnTUL8hHg9UH1OJTHxup/OfeOm9RCwQUgMaU81d0TkkqZ1Ko4Gj6FKthAiZuag== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4213.eurprd03.prod.outlook.com (2603:10a6:20b:1::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.11; Mon, 10 Jan 2022 17:51:55 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::19fc:be9f:2c9c:53f5%9]) with mapi id 15.20.4867.012; Mon, 10 Jan 2022 17:51:55 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 10 Jan 2022 18:51:43 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [4ICLnNJ7I7oVa3PwT6tzooyKHYrAnDPI] X-ClientProxiedBy: AM0PR10CA0047.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:150::27) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220110175146.610875-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 52ed7cfc-5f59-4a13-da77-08d9d461e3c7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWm3GLoeUntTG6KfWWWbWhl/ltQvue2qLPf5uVpwbGirHMxTIGiK4vWGCr7grtAzqIH4D1c8pxq0up3ewE3vkzTEjY0+84evqHgRNegGikbAk5HZK2Ps0WJ/63SjCz6tm4HyQG0S9bSJjl727V7DVqxN4tRa1IRBZKBf8F6a9asO1NDfhUUf9dAr2B/VqV563ssHTa8JlwKKuJPZi8R/dIfTCp/pKO9gT/U/Ri6SlCwvveZPxZvZ0b4MCkk17Y8nEuTH6kdzCEzYY055GJs79F0J3Xhlh7VUFXbyd5xE/6exUUXrMaDKHy2gl+nP7GY+Uiz1jipFv9y4F5SaueuZGAy8yALg788BOjMy5FRq4GvfgJBAcJWVGFy1P1x2B57XJlU4CePDUyat74tjhOSneB/LET36VSaPncxjjq5jLtbgoOHXp8vaBUfAM4pNrxl3nhopHLpSfy7kosYnvKbfqSgssaz+Fdt9BtpppmjBla9WoEqCP9crAdU8CnCZSyKUqXb0BaNx73STmH+kUtMoOqjkifxtnCBHSFiWLcj6WsoVXb+EnYqiQhWREu0XP6HVTfyk2iVw8/zJ9srxKNTt1pfqCQZdK6+y+zEJTAt+UGAQ4Tm8bYI0GWEUzcvIJeNA/BGU1I/kEk82Uyi7B5WyZvodowZAxrbcBoA5KQX/ZgeOoGo/yrpwbfVroLAXH/dIp2dPOzYcUjdT3U655ZKVZUlyPB62IUyHZI= X-MS-TrafficTypeDiagnostic: AM6PR03MB4213:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ADFsA66J0xI/I2kzxyOfpwctqA2v5ySZGB2JL5Pwq0pGGD7Cwq+Cp4GWXcJMwEi9oZjKiUjhQs5pl5STMsWXEhTyBDb1mUmqPzMzLCDjvHznm2ZnqJsIXjG2recy3lCZWaJndsAW1ZBk6rpY/PjE7Fvt+ObArN2fW7A+PDtTLylnBA1MYV1dOi+Yfl0n+xXnkD+e6WI8gDdMQqgZiSIG7KMz9+twabs+AAPicEQUqoosQE3QGgu5yLMiK2iozox/ts1G0Q5lQFZtU2l3ZMNfSPTB1wSQxazjZIecbtYINH1ieamNvtIcFJfWi0Ivn3jsiqkFBediyUi9QqXWnFYi6Y6dlorUFgy3u8FOsMzPop8FOndq/iyw1B/2f3IdL8hgqTMHPJJLqMy0Rw0oAq7NyAkPkGn/tamvGubT+uJD+1a4iHch1kPdTRt+nKIVYcYeP2laitepcQdLYPsOqZWhyUA6POmURfptPkPacy10ec+/8gRF7qrIc52eu65cj/dhRuUW+EGbh2ZHefdHyEmbkzaqG6M1zcNnu3jWFg9qZqFesYLa3NINs7ZBnYP4plMssRQpWUzL/3gHkvfatKnozg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vbSdahxVLZHYEX1ZpAUzjAckuWWdhCP90NJ7msycElP+8pBfLlMOxBtA2k6xmTRbMpkxnv5KBr7FrjhrBSP/6fGSwZO2g30rHZGF3fpSOdYOrvx5D2iCLIz2QYso7oRCYWXDHF1dUGphWQjA2225RJUQ4lh4ZeMifmGlRqbQ3u03pD/Y0H4hoBREbweISxgC9eAvR3796oD1edMnFMoyguQbg6B7cWqHzAgLmODnpQILLSCCqxF9UwJUuGgvOubW7yxSEcx/04gyvo0/xGpKhA9tiE8sc5QkAavShp7k017vg/dmSl+nUmxo0xZNnK6JTeUKVxDpxG7KUvxdRgWy7GqehhocuHIB2BiRgMdPCIOiTY9cZJFne19O8ZNUnEd6OO+xnLfsDFtU5bcjQum7eeiGTdmxFd/X87in2AUAynFHH8ZnWQBFYnZsJxxv9bHeqa51qr9KfQgT8EUY0P6thQjHP4vSWSKwFG/cdibjE4C/Q1++qvxWkZ6J2KR5370tVPzTYtxyE6QB1rLMk0VZvWQ1kghNVhsKAurKwx1vw727lCMM7o7pZOpZNUf3DSjnB4eBaev0yDdh9IcRGvUdaJNGfjbbQhWUQRC7dpBB1836GyAKnzRK02qGvvlu1gXOTuvhuBg6psu9UCoH8Vjk23pmAbU/NFxdDrK16c1CctJkChHTqUedsFMzspaYWaydDdiEneL5zMCnIPwQYwmm4kvYa/x4S5PCsKgMkRzLblBwTUrtLiibGkUN0Aep8uypXN3LcA1Pzq14zTsOm8PecjVCyRp84DskXaQvk/dsFoFBX1vjUyiYPXaLztavaFX69TBqWAUADBcaH5jqSXUxksf/bwZTCxsOFJjCrwjcqub/z5vzDlpVruxpuxPTHzzgwZa53Dt4UCpeSLoH4jFjAtIna9xDjVexJEIkNUI/bajbPZY7RXAQBbfx40LCCoGt+IcenwAx797tBeY2gF8OXg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 52ed7cfc-5f59-4a13-da77-08d9d461e3c7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 17:51:54.9796 (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: AM6PR03MB4213 Subject: [FFmpeg-devel] [PATCH 3/6] avcodec/h264_slice: Inline H264 codec id 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Cvt30nQ2OBi+ This code is only reached by the H.264 decoder. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_slice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index f9c300bc2b..4833282191 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -998,7 +998,7 @@ static int h264_slice_header_init(H264Context *h) sps->chroma_format_idc); ff_h264chroma_init(&h->h264chroma, sps->bit_depth_chroma); ff_h264qpel_init(&h->h264qpel, sps->bit_depth_luma); - ff_h264_pred_init(&h->hpc, h->avctx->codec_id, sps->bit_depth_luma, + ff_h264_pred_init(&h->hpc, AV_CODEC_ID_H264, sps->bit_depth_luma, sps->chroma_format_idc); ff_videodsp_init(&h->vdsp, sps->bit_depth_luma);