From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id D7CCC42F64 for ; Mon, 16 May 2022 18:40:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 421CD68B47A; Mon, 16 May 2022 21:39:34 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2016.outbound.protection.outlook.com [40.92.91.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8404D68B452 for ; Mon, 16 May 2022 21:39:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W2OuxpvdnLnLzxxPpaab0fBdDvL8wx6r16s0bSkWHckfOYXdVILy+oSzm4TAKs5mdRWoQ8WnQJ0WVaqIkV8gGeOO4J1wAwE3Q5lImDbtJ8EFYCmvoVEVCNVAAhVb4PNm9jaaWaa3X9qncqRMVTzsDVQohSsIZi/UyyZpeqz+Zha3Jw5a/7WkoMStPF9ggB2tqZW0nNqQV/wIkfpwvusclGBbaG39aEEINbfmN9DazeE1+EceL67YThktliUL3Hfw24lZpUV4dg7+08HOKYbBVB52eY7m9GNmJ59DyXkVBAeRVq1KvQjiba8uLtTefgjSAew9N/dw9Tm/6P5a2Pb5XA== 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=jfT0zeO7qiGy217isPU+rFgHp28uXwIKclRAYvZq6Ws=; b=kM//ljT7LzwZxRvqGeNqyIoZzCx44KHZbmVl8EsHOHi7WEVjuE/1Lfs2zgf8jwStNj5AzwcrTrWZLBFtsXMdOYVA0CfQAPSNdD5xp/Shyk3nP5CLBoc5+b79S1yrIZI1sqDY05dKsMxKn1TESMXdLXi/EqOSmVZrWmUBxIwjKub8+jF3n/pDA5qFQKxh8xe9HB0jvqJ80ReRGGZqIVGOKwQIGY3O0+qEx/SRFPOqh47G23V5ZSQX7iekQd3JGrNfWsLpBJA7EF5+/zK7LQ4oLZW/2rLFDK92dqipBeuSA5rP+exJOZZ2a6fCCj4FbejC/nz5rEoOxpiow63K1a+rDA== 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=jfT0zeO7qiGy217isPU+rFgHp28uXwIKclRAYvZq6Ws=; b=BJsOn3wnf6WBVNNs1OvjgtuOWyE6TkdFw77h7255XmMyYUZZI00DxvUN1Wc+cqUCKW5xSlPKvNhB09aqf7du94dBMWG6nMYJTK5VmyOrt9GlB0Q3mk+yMHKLp6YqvGYoFYKwZaPquoNCYwvS6VwYXJJNtSd2Sn6F6Tia5tfyI7V/rcVMLXyyeG+NwzibxXi3kMtVk0tX1FAhvDogeNUjgP2TrtibWKKDBVWnq7YtBMR6Een0nC65TkGUofAk/1oIDcgMJjr0q+JovRorbNUG52Fm5XSKFHuZVwHgXiaLGA2GQoPWPIMorN9Zytv1RoXlBJga13x/dHMs0zHGBFAH/g== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by VI1PR0101MB2414.eurprd01.prod.exchangelabs.com (2603:10a6:800:4f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Mon, 16 May 2022 18:39:23 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5250.018; Mon, 16 May 2022 18:39:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 May 2022 20:39:00 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [sawYVYu6bzhEARScXMP1uiH+TtiXLTUd] X-ClientProxiedBy: ZR0P278CA0066.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::17) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220516183900.616390-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9981cda7-fb8a-4124-cace-08da376b657a X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRAro5Pl0DReDVvFi4iRqnNdWMtMfDzOWP49Y5W2FcUwSJIfh5YI4U2UOK1ETNrhjIsAI9wDIMudp+YotzBD1qQWtkYDbe1ScJGmnpRzH48J3Z8S8PED3tGtREgF9RLJ5wlAKECsQdX7pLx9NLDv4S5siR9axgMBg3W2wfB+WR/jIaTOF7I0aq4rIClERyFlSh8lLCHRjVXrWf9TBnliEDWDluoPvolYhWzoLSsnnc6Oax8wP1lyI2W5nnP5eSb/fzNtIZSONDGtms6cVb1hnWWq8vUCDp/4H6ewrgDxTyRUmsJmkGyEBuKs/E8QBy71JCeF0CxxWsoAIjPEEEM6YP2QnipFy0SJf3f6PzesxXCcK4Ki3MCj4jqv+SLw/XBm/MbAADo8HHRHes0WzDm7erB/OvWEBtW85BUGckOp90bm0KZrbjsBD3OO6ypQ/lkHGNY4A6C7HgMvw5G3Tzk3l0CwcgX5tAt9JmwaOR6RlBETcXW0AYrI4pX+I4oXrqXTw/vtLpjFWg7HdEsu+db8Dz62CmdKY5uxrtpQTc5+Wj7pOa9FTzkfqUwuZByeCdhxTU4d+LWFbtDed1pgdu65qWmOniPyYhoIkor0afRx1KO8Tt9v82N+RwPv1qlNRKo210Vj+bYBARMlMwkISTKBdxcCI1a0UBLpuNXJE2S8dYjVv28fg4J8Wq4r1lLuMadIB/zK7EPiDykldSdTIdK34sKTqixx0HTqUm2wjItlNNwWjxzX9uBJ94ws2eIvAJpTfY= X-MS-TrafficTypeDiagnostic: VI1PR0101MB2414:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7jSnjpwW58Trnl4UIMUjLo7WEg8X/7BJuMXkgP6/AvVep4HNJVKbmd2ZiH7dBVR59FETC9cS1E5lBicuo+NloxBoYaiHYU01UhLiSEHUCrOYQq4WKRicMFOtch0DjfljpkAYLmQMO7Oe2zhDKcusdXQ2emb1UXDxNWF6kA5KQqJBqbVoBhNEuUXdyYDGZ1hId24g4OxjDEjLmKnQ5+v513hoUgaZ4Re+6np9ZJmeArB1D78FyvFMp4674jAP+PjfeBzUUEfcsAkRglu25mhkT7Kv69I4cFqBIbrO1O5ZcL2ITVJQaTR3CHvwteucF7rlfZUyzJFFKm4QiLFUzRXglV+F1O792LNLTnnkFq+FQ882cJm/VFTG/3CGCvlETWQ3nodGnJh9mKto8PrBOcDlMdKH3FUXG29EdzNZHyymemHx9dA0yqO/gUxZNvtmRwqDlxKODcjl9A+ndt2UIQOvHol4x34jvGddDe2V+fHVQq945j4xh14CZBSmh8v+vnKFVsmi7V7+re8hgoEuduUCnyQNiMhOY15Fi1HFVYh4fUHZf2iEgUmniuYDWSTYi5Js63mrM982TVmD8RZM0c/aMg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?WtYL+sT8mnSNtS/6Reuyk5gCqRfpemRptiMpWT7Xpd0J1oFo5dh+f3Djzt/a?= =?us-ascii?Q?zbwlHToccTCxooWL0bB+q/bRzWFq/47znqebdqXt9Sre95JK6q0pBanBhxi1?= =?us-ascii?Q?V3HdnRJRU47NrdJbTVPAVz/Oxb2+OpyGsZ1qJtLWqprjmJWSyDAtiioFyCKf?= =?us-ascii?Q?K6K9RUUGlMx77n9IIO3gl0ksKhlhyx309UcqQgc1rfHBl+gl0y/su5vLbrXO?= =?us-ascii?Q?saEqKH4HSXJcfggBZeOePhmZh7R+pBGzYq88kntncYax546JXE54wxHySLdr?= =?us-ascii?Q?90mQKuHSXz9wUvwxQ5+kMQkPoi27VJdmbNsB4W+TYNMmx29zEfReMD+iqQ4l?= =?us-ascii?Q?JYxk7kAZrsMqwE92/LGw3stoMs0AswoHA2j80QXUUXck10AKOdpw5y+G+fHe?= =?us-ascii?Q?vtk/ssvXmU+mrza6TDv0Yt20e/be8DY0kyX1Hj/KgOAeB3PJZTDiDl1V0qbi?= =?us-ascii?Q?g/iYuMCPX9LnHDPf0xuEaByNquA1kVyyZCB0FqJzXGUfBV/kdP7EfnpLSZse?= =?us-ascii?Q?smDIYkVhI4G4XAMGqdUcRIB+pd3ti+IIYXZrCfOXwvxLWeTgOVlGNId/mK6/?= =?us-ascii?Q?fkggTwZN2bKkEEabhRhPwOar2ofQqVeFO+IA54GRWWtUcJx3OleMvo7sy78n?= =?us-ascii?Q?X2M7Kp8jb+3Oiq5xBLoyx1tAlFS+1B9Iy1B1VQ6GMPEABWjeoKclYF5wT9kM?= =?us-ascii?Q?AsuN7FUsBXLmgXpzMM481PHiOC/UOd1402r9KWSKC9bv9njFSpQzbnAhnZF7?= =?us-ascii?Q?tWLZLTu9xKkjloh3SQzp/1k14kpHB3bdiU2JC99COC2wmRSdroGV1s3RFX3L?= =?us-ascii?Q?J+mJCEMsTduo1jjZHX+/sDDTvyoUgIuqXbBwJ0GtYD6EczYcLPkJCgafBcbC?= =?us-ascii?Q?+C+9k7yD/ESg5mfCXlevcQxpIWi8hCbmkg3viMrpComqK9pEBU4r9vdZMHWV?= =?us-ascii?Q?KjZz3MY/Itz1E9NaC4kfBFAFUnneivRhhCX1rjJWMCPv0JRACEDaMIyHTH1G?= =?us-ascii?Q?0T6ciP1d2T3ordOSjIc+AGoypk9Kes7dGrLijtKlR2suptQQMPwaDd1LPvEy?= =?us-ascii?Q?feCb4BdTcn1A6JbsxBwEl+PNwv7OcIu9hOeWNiZjaZzEYVib666YY1K/LI/i?= =?us-ascii?Q?mzrDQkxNRQdjq6PWVrUEO4PI3Mlqlb0towcOwmwtS0dg02q7beWB64xO1Hrx?= =?us-ascii?Q?Z78WnUs7pHr/V9729DHaWbiGtdtMBul+7cARkgK+2qBrR3kqe6xvdssLqDZt?= =?us-ascii?Q?6UrLxk91mWxPbTav8tZ8Yit3hAzCI4nk82EWN+1YQgOOqXZIpf3VV03fZY3C?= =?us-ascii?Q?mbWDrEvQcKc3bzInPCcZ0iMr36U7uiIotRSjiRmRx/GxpHQmSYad82MpGCPf?= =?us-ascii?Q?7FoX7qC0NK/DJnBzHYLiR7ojUM3dVQafRVxUiPDzonwix5V2geeJTocnGJi2?= =?us-ascii?Q?Au2hMEIlwEA4BBV0OEu4X7G4Fc8AStEk?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9981cda7-fb8a-4124-cace-08da376b657a X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 May 2022 18:39:23.2264 (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: VI1PR0101MB2414 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/mjpegenc: Remove ineffective pred option 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Never did anything, so it is removed immediately. Signed-off-by: Andreas Rheinhardt --- libavcodec/mjpegenc.c | 6 ------ libavcodec/mpegvideo.h | 4 ---- libavcodec/version.h | 2 +- libavcodec/version_major.h | 1 - 4 files changed, 1 insertion(+), 12 deletions(-) diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 0ba166da5d..27217441a3 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -627,12 +627,6 @@ static int amv_encode_picture(AVCodecContext *avctx, AVPacket *pkt, #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM 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" }, - { "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" }, -#endif { "huffman", "Huffman table strategy", OFFSET(huffman), AV_OPT_TYPE_INT, { .i64 = HUFFMAN_TABLE_OPTIMAL }, 0, NB_HUFFMAN_TABLE_OPTION - 1, VE, "huffman" }, { "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = HUFFMAN_TABLE_DEFAULT }, INT_MIN, INT_MAX, VE, "huffman" }, { "optimal", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = HUFFMAN_TABLE_OPTIMAL }, INT_MIN, INT_MAX, VE, "huffman" }, diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 4b07c5bfb2..82889a0edd 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -536,10 +536,6 @@ typedef struct MpegEncContext { int noise_reduction; int intra_penalty; - -#if FF_API_MJPEG_PRED - int dummy; ///< used as target for deprecated options -#endif } MpegEncContext; diff --git a/libavcodec/version.h b/libavcodec/version.h index 497389d3f3..56dbb9238d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 31 +#define LIBAVCODEC_VERSION_MINOR 32 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index 87609d5436..1e23ed5e03 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -48,7 +48,6 @@ #define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_FLAG_TRUNCATED (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_SUB_TEXT_FORMAT (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_MJPEG_PRED (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_IDCT_NONE (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_SVTAV1_OPTS (LIBAVCODEC_VERSION_MAJOR < 60) -- 2.32.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".