From patchwork Tue Feb 1 13:06:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34022 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp609622iov; Tue, 1 Feb 2022 05:18:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJwlscVAAq8hfPLwJFcqFKLclVgMaMNxImtb062i/htdXg9SsdKWW/qpidZtNWNd5kfpWzcy X-Received: by 2002:a17:907:86a1:: with SMTP id qa33mr20603510ejc.516.1643721531305; Tue, 01 Feb 2022 05:18:51 -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 d16si9331797edq.80.2022.02.01.05.18.50; Tue, 01 Feb 2022 05:18:51 -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=Ss+vJI8q; 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 C473A68B3E8; Tue, 1 Feb 2022 15:08:53 +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-am6eur05olkn2064.outbound.protection.outlook.com [40.92.91.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD2D668B3AD for ; Tue, 1 Feb 2022 15:08:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NG7u9f86CdpGlohWjgT7CQTo6F+vPYYrOg0bQt4hVdP2vmG1lWIOLRapVrh8tykIyCvwO3Vtsx4SZFmXHcMoA3UdpRRTfoXY5yJ5iqW/KqyOWeI918cvik2myfxherO+dJTE2cIq2jZKIXQ2QVPqS+8Vl8Tj5GhwSQzM0VSjJRj9bxtrG02m4P8OhQr0GLwxknlObchKSVGXtcXrPuk6ubnAspdya40bRAa0+za9pZ/rV33feMdv4hXznT0+12NOCMnr81ZXy27DVlED6GaqGTbUzOSOGP+uXK6wGgdF1AaVDQa+TIGRyia22Xgd6S8jhuTai4b+ttrRlCj117lGwg== 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=x9iKCoUHq57DKckfRVlqdJ1v8691yv2nrrBoNS6aUZE=; b=KvQo77M4x+Tq/sV3Ksu+3fpp4Etq8jHM45b/K9DBSwJb2ziwwMq0cQAvSFARfouCAGtTYdxTiQ+lB+Ofwync0/gryY0s+GsIQgx2lVNj8fh/TRAeL2UmNtU+c8kYj2Z9b1KQ5b/J/xtdahcBgwbr9hjZKL+Q7v2NDcI8r5sID+hNoAiF2O7PB9T7kgstsPc6bhRW2FEMRYb3wRk58T+C4s6x0mbRL+29m0dceVtfZojwztG6Xz0lAuyPSWhgosqQ5a25sGB2x3IiftXbXd8OFwy22veO57a/MnQ2soMoVo/YQAJYxUltKSO5WZg4paOCw4ewHpS/0qTXY/9YaL0djQ== 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=x9iKCoUHq57DKckfRVlqdJ1v8691yv2nrrBoNS6aUZE=; b=Ss+vJI8q97mFegWMuULbRDo44yh5z64HMEytjrt/S0PZXYQvFZtsHqyNPPUPJaS7zicvi6InExOH4jypRE2P9s6uVS/3nN/pHLllnk2rdhJrwBiMri95W1ECEctfvO6GjL1Vla8HQaSDnd+RvTFyeUcG2y+26Oc+kSUijIPFmbn/J/w+wRl7Zbw/Pryvbrdtk8AlM0iM2UjhuXBjIMGS6ItO/+cLgQ2CW31N+0jN1nc3j9OkQbpwPa4ZIIBITMd5+d9OcRELH9D04PdSMVA1wiRfOUw+eKIVc0FcNak+MnDvHx8KocCurE0Th7D/7L2f9ToB6rGJJB8Ad65Gj52Z5g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM9PR03MB7962.eurprd03.prod.outlook.com (2603:10a6:20b:439::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.22; Tue, 1 Feb 2022 13:08:39 +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.4951.011; Tue, 1 Feb 2022 13:08:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:06:47 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [I5GHKDejcbKkRDm4PZXydcajfEaIP1wf] X-ClientProxiedBy: AM6P195CA0092.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220201130706.1420875-49-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 64db5053-4a08-4bce-694b-08d9e583f0b6 X-MS-TrafficTypeDiagnostic: AM9PR03MB7962:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: uzetZCPZduBvH9cL0AUtReilrllKYgRL/rxnsijKIcHdKVib7nywFZNvDIhhbjpCV4jKnLVz7pg+dpN9Dx5bIVBlbSWrMeg8fH7M6TlFWAUDNAu44nNMl/CgNa4OOEThQ3NxaQOF76AS+1xJHDxyDSlqJ0IFXRYlePSJutNnTpqL20BpRI5s1YXGx565ReiYIbWoSssxU4El14Ec6uV4Pb6TuhfPyq19ZUSIUSIc302EkldJ7L23b22ISaBFDzm4TjG7AUherhKD2WbNcE7wAnTyfJYWmB5ey4HFuTyloxs5ResRUCBdC/xAJXiU1Jg4rshTjUviCDf/HYGTqiRLK+g/32I6XxGR3fQaztsD2TmtxIVS058vcLpZHYL9khvVjgeTw9BoOx9/mgpy/0VjKNuOlq2sAUnqU56PKUH+7Ui1EHBUIxz1ULB7t+HUmsU6OelERYC2jqUALRKD3AiMl5D/vik1cuiX6ChHFJ6v8Q/HJ6uqsMGDjWa30ZH8M6pdB59AGacvktJLYZzFr5zo6uDC4cvdxxJAoWZT8mepmfln5GEJkzySfd6YU6WXshwn X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Fz4lUn+L5U+jsaCnGAXwHcgk6o5H2W06giv/2Rqk4mFtiGpgzI7I9W2Ct/PNWF1sJ3xMRftTrN08DSIswj5yVySwKG29ZrEVmUhEJL/8lk1PT8VNi5gsKJqpUu9DpX1CNuhEaIEqpSjz+45087yvlMMOKbBBcH6200+KY30OhQrKtC2G5uCLxATXIJLPwiOvQhD4xQb5TJ9dMMGKvQbO3Xx2DNDhkOiRxX3vg3h07m3SGziXwmxYTH4v5MShI2/yqdeEn/8NeQkmU1zh0j/T6lcFk7VUX+FebuFx3lzMfHcVh19MQV1BaihV2Tc7+3dCORSRwMV0bq5q/Ey+UBIgRTmnKUIaz+vzufu+gHw97+0LlumPitJnodhaLZravV1RVNRsSpZzVFg0JPZcOzo1OFe0EQksFBE9Y/lxNSVM2q0GHMqfP5HpaVv5UyGC3vmNCs4f9idK5EnlfQd3CHqraiTf+HQ2s/19cJjwzmpZAkqw+CiU57hy8V6frTSqOfp+TbHVn9MKYPlslJh6dhp1koOwuN4J1fJqzDxGzRcMMU+KRG/OVw0fhbtm123zKSvjiAc0G4IXrRNSel0sOlTlKBGRec1ZWF4f5Be/il7Mcfgxs+cppS7DXl1TOqdjujcbYeotKp/QbA+pN76gwWBpQdXzYxCqmIRuUW4aPxv5YQ7MbK27AZ+PZXj5Ayd0weAcxhTpy9qr2dUrlS/k/cnAk/9cifswODAgWHOb0Mj6zChA4Npo86bSM8P8RrWlP3RufGE5NWhZOr0S/P/kjMuT5UpjHxNkRMx8ki+LN9mVJHm9aJjhIUDKD39wVTt1wZmpYFS3HlPCgGQkoxBh/T2ihatv0789Jq/tdp3GlHui1KEjdd5XhBvEbmUs7RCCCYK+FODoGWgiQZjO/rSv3EZiXxvHzz9rtF4aJqHWE5HbmvLjKtiy4b4ltMEfMooPgDr/o7cEbU6xwvMAg751q66CTg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 64db5053-4a08-4bce-694b-08d9e583f0b6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 13:08:29.2848 (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: AM9PR03MB7962 Subject: [FFmpeg-devel] [PATCH v2 50/69] 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: RnX3do7Dumt2 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 a8ea63a76d..360653c5a1 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 4601c4be64..9002c0549e 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -481,10 +481,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; /** diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index 0abd315846..51610c051b 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -109,6 +109,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; #define UNI_AC_ENC_INDEX(run,level) ((run)*128 + (level)) @@ -197,9 +201,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 }, \