From patchwork Sun Jan 30 06:27:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33940 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1772378iov; Sat, 29 Jan 2022 22:34:31 -0800 (PST) X-Google-Smtp-Source: ABdhPJxvwq9rwhPVYauhecPULoYOpKMkp9Fwt9jO5PKCh59wFW9R+QNikljrRv1GCMeBwZO6E5QQ X-Received: by 2002:a05:6402:278f:: with SMTP id b15mr15889136ede.103.1643524471707; Sat, 29 Jan 2022 22:34:31 -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 qf17si5883307ejc.159.2022.01.29.22.34.31; Sat, 29 Jan 2022 22:34:31 -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=XEbhTaZE; 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 8443868B31B; Sun, 30 Jan 2022 08:29:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2048.outbound.protection.outlook.com [40.92.91.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14D2468B306 for ; Sun, 30 Jan 2022 08:29:22 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q8ZoPrrs68q/8Pls6Z4ncw6Te6m/pBCHozjJz5bIiEx4hcBXHlzcmuxR8XLE7KsGlqNkpVeoVNfbjJ6TGtauYYgkTS7kYbEVE325NcEMcNPDifX02IJPmas4UdxOS1UXmjKXnu+aGqhP1RJJASqgRwRD3p+AcFbhFeMi5u8E5lrG+63ez5T7RzD8N7e3qNYHtaUf50kg78ktqotgNSj5v9VlU0XbUKvR9uDAKTU8saAk7DxlgimbBG2eHUVt1vyEDp19cbD8NBLnSvjJiVLVIQsVDdMWV+/102Z8b9sHsgWq1TB6W/Xuu/E8A3BHsKS8BD8rEwLDrEi0i0nornfXvg== 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=K1hExUhx7LXMLqRf/sN4PUZdFpNOyQcyRLJDq6GEL40=; b=KrFtK4bM1XZ4rcbKA1IYMG4/zzRcUCVHloDHj6wB32AhdcbZz2kSFTPThwRUk48PNGl0Ci2AFTR1nMBPOAWfYbOlwRrDNHN/AmSm83tbZSYrMjHOsdQfLR86zEwHryZTIDwfk7EqPVhLG4KseZrr5G8huW68n3UHhzIPqtL7RHYtOOd97cNO06JoTxO2aorfH3IDoxKPXY0pDMVztni35Ecaa3wzjHMmZQ2ZL8sr2AuUTMqEGaPTed/cJXrRYvszJgUJ5zJMfmhSxVMNPLnAQam+Mo79s4A3u2CfBmIpg7h/QwziV7UhCPYBtuHk60cyhWwXZaG4xE0NAoLDkwDc/w== 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=K1hExUhx7LXMLqRf/sN4PUZdFpNOyQcyRLJDq6GEL40=; b=XEbhTaZEAj9hVBAgLt/bWih7brWLn53dWZJLs6qGvhqQMnrMX8NyLvAqig0UcHP4nmRW8QwaOIblzKahOIUx2NQqAOXikgfx+3COW6ktcWfL9mm52mSaGcwUJDosSPaXIjMtPHdzlwU7gFfPrJMh7nTGIZBiOrssX9RZB3+5FKgGh6iyg/zkh5LyKsbM/O0SvTtzlLvPUDlCYG/GC468TQskPg52zU4DZDUGk+X1/pml9xqcm8tJh6/yob9+Yfpu9JgMu4gITxJiTn1bxWjR0Ab2CCLKfvQlOCIVJXs2S0NBjlvvBFch91JtFqvaRK7Yr+XJzhvg9ZIl3ia8iMFZDw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB6239.eurprd03.prod.outlook.com (2603:10a6:800:140::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.20; Sun, 30 Jan 2022 06:29:21 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4930.021; Sun, 30 Jan 2022 06:29:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:48 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [Hj6ywXsQHBPoLCjO+6QcuwxzDJruC5SW] X-ClientProxiedBy: AM6PR10CA0044.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220130062749.936489-39-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a083f3dd-fe7c-40d9-32b6-08d9e3b9da10 X-MS-TrafficTypeDiagnostic: VI1PR03MB6239:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CrQPtYkiw6OnJZc+vQYelPH7zG6hcNzHNTU+Zv6eSDUjBc0sOgivYx+nOfSUtqI0U03SZjTVx6Qqul6Ie2yIyjT+ddyZcYZfryIR0w26GyCy0qOuNgFzp/MI/GBgp9Axg/wYzm/IBF6xwNPpiiNROhwS6wTOunaYJp6WrMK/UZWp1HTNzxA7y7v++7wEGKWRkkzjiEMnQW5f7orSa8fsFdfa7HCp/9M1qSwScUby4F6FQnbckSaG8k3WUwo8M8AWf9bgTsaF3N80qNoaNRt6aGhb7Yq32Dt33+UhAsoGWlLm6btjViaIobs0ZW/ttGeG5Hk54ryNm3KiQRzPhNc1NsfuH3m+GgC6tvr5/k2XjG/LGdzRjcwprrXVp+THEaqEKV2hAKHfDpVVSu5dSxZh5kOje1Emczk5J68r3gTRnw9k3oAVAg9v7Yfc3NRdnDKWfcnEmrMwijMzI9TyeOoSD6Lt42JnxX7Gs9ScPLZGvuYcbuf62sVdAYvre7T1UmwNxEsQ5tJA8+0G72w5gJHhioY41WHKkfc/30QOe25VC/PDp8u5c6ubNapBnynIhk+a X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: xNEebb4nxbWQCPM+uamRHoML37+25H8DglJgJw4yBmyl+5k/SgVih0rA4BuucCkurXozQHIj+Q9Nj34g3o+B31ZL3ltJQAoJ9sctfbLJoEF4Uf52WHYoKsPKVxox1lr+dka46O8PlwVJbBX81eufhFhgibx3Yj1UqcD4TF2ntqasmcvmiq49CkCLyNNIGYq/ppG/l1WDZWgCpFNR+iOeikgrUAzkcrMWesNehZYs5UFWOyD+XMRYYOuu1VJMJ08EkO1WNcMv46+cBo99R6gp9+oAGaUPsjTcAljW9XKvlfw+cYwIHvJlK9wiYxQ5QX/fPhAFZ0TFkMGWFZPGId/aDHD2s/kEsNeDU/QYF0vqRFgnIuFE+/xPkUMe/FUT9j/6cSAWpqrC0rqjBojlCXu7dm98Bgf+0EEaHW22Do++QHZuC64mkqH2yyuaLJKkMJfvOX+6M+TeWFCO+i0Z3FyvMrnnALfh41UoRWDxSU5OS1VnvQTNQUxbCEmY16qj48PdzoFBhDqdQF0FkbzxExGH9zDWI0mcd6CRSRkZnwi3n3c4QTkzQ9Yo5Kk1vLeaHZzhiMbahN20o8JbEc8ynUx77OqnQXD8G+1iSV5Co2v4XO7Wb/HEqpFvtK8Lq+YLlebZewru8xhkk859PgspPRBLfOMFxs9f1lWKb41BUiP5H50vAeu53std0i8iQciPje8hlBCNDRo+6TdvhFlj0A0OYYWbTMfgd84GZyRy40zOIeH1cvD9MTlxLz+eSuIoce337oXSWnX0u9ur+tAFLEzhlFFcG32s6CI6mfwGN7LXWW0ZU1sWC23UVNqiVtXdiII67HSiFPXD9LwQc2ea/aHonTYsDS3MsyQF0BD3zSJZyPrRf5wbB4CacBJLaXp/3dqLUNsvL4n5J5kR/cHExudeKNy0M0U2xMwjHzYt1njTUvx9wAJ9009MuOZfoTqaq7lv7hP1qwdMAvN6TD34DoUdsQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a083f3dd-fe7c-40d9-32b6-08d9e3b9da10 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2022 06:29:21.7343 (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: VI1PR03MB6239 Subject: [FFmpeg-devel] [PATCH 40/41] avcodec/mpegvideo: Move dummy dst for depr. opts to MPVMainEncContext 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: tTlzoTzTn2Cz Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegenc.c | 2 +- libavcodec/mpegvideo.h | 4 ---- libavcodec/mpegvideoenc.h | 8 ++++++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index a8efe72231..064562e6c5 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -631,7 +631,7 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, static const AVOption options[] = { FF_MPV_COMMON_OPTS #if FF_API_MJPEG_PRED -{ "pred", "Deprecated, does nothing", FF_MPV_OFFSET(dummy), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, 3, VE, "pred" }, +{ "pred", "Deprecated, does nothing", FF_MPV_MAIN_OFFSET(dummy), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, 3, VE, "pred" }, { "left", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "pred" }, { "plane", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, INT_MIN, INT_MAX, VE, "pred" }, { "median", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 3 }, INT_MIN, INT_MAX, VE, "pred" }, diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 5c7654230a..bf71d6242b 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -485,10 +485,6 @@ typedef struct MPVContext { int noise_reduction; int intra_penalty; - -#if FF_API_MPEGVIDEO_OPTS || FF_API_MJPEG_PRED - int dummy; ///< used as target for deprecated options -#endif } MPVContext; typedef MPVContext MPVDecContext; diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index 662236c102..ad55448363 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -107,6 +107,10 @@ typedef struct MPVMainEncContext { uint16_t q_inter_matrix16[32][2][64]; uint16_t q_intra_matrix16[32][2][64]; uint16_t q_chroma_intra_matrix16[32][2][64]; + +#if FF_API_MPEGVIDEO_OPTS || FF_API_MJPEG_PRED + int dummy; ///< used as target for deprecated options +#endif } MPVMainEncContext; /* mpegvideo_enc common options */ @@ -195,9 +199,9 @@ FF_MPV_OPT_CMP_FUNC, \ #define FF_MPV_DEPRECATED_MPEG_QUANT_OPT \ { "mpeg_quant", "Deprecated, does nothing", FF_MPV_OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 0, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, #define FF_MPV_DEPRECATED_A53_CC_OPT \ - { "a53cc", "Deprecated, does nothing", FF_MPV_OFFSET(dummy), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, + { "a53cc", "Deprecated, does nothing", FF_MPV_MAIN_OFFSET(dummy), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, #define FF_MPV_DEPRECATED_MATRIX_OPT \ - { "force_duplicated_matrix", "Deprecated, does nothing", FF_MPV_OFFSET(dummy), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, + { "force_duplicated_matrix", "Deprecated, does nothing", FF_MPV_MAIN_OFFSET(dummy), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, #define FF_MPV_DEPRECATED_BFRAME_OPTS \ { "b_strategy", "Deprecated, does nothing", FF_MPV_MAIN_OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, \ { "b_sensitivity", "Deprecated, does nothing", FF_MPV_MAIN_OFFSET(b_sensitivity), AV_OPT_TYPE_INT, { .i64 = 40 }, 1, INT_MAX, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, \