From patchwork Mon May 16 18:36:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35792 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1673858pzb; Mon, 16 May 2022 11:37:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwC9/0Bh63sHXKHOXXpI8PgtfyFQkPNQ0X13RkCe3TlEla02WiU5r0kVW2oB4yZbpmg+pcV X-Received: by 2002:aa7:c38a:0:b0:42a:ab63:c5a3 with SMTP id k10-20020aa7c38a000000b0042aab63c5a3mr9378031edq.303.1652726241934; Mon, 16 May 2022 11:37:21 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t9-20020a170906608900b006f38e90d86fsi103927ejj.256.2022.05.16.11.37.20; Mon, 16 May 2022 11:37:21 -0700 (PDT) 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=JlzmZhT4; 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 CC94A68B39E; Mon, 16 May 2022 21:37:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067070.outbound.protection.outlook.com [40.92.67.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D86BB68B0A8 for ; Mon, 16 May 2022 21:37:11 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mEpf+2zQgyxFpU5WUzi7QBXpP8LWit+X54fFBvL9xUvznKooUXuvhi8JrSO1Cks8GHITS+q0qn0wXvIwXs2yWlHRbIuSYsALBUlTmympZBIDs6FIMI7zqEDpYxKUFbOHY76ZoKVKyDwqBZpdi4/1QhiBoawKEWGsKZviP6OKgIzdy75gBMWCoFYQbnqwV+oCC6m5UQhKh0fVNB69e5cElDB/MAKuwrFNhWgOyo3NniYZc+hX9RJGvjjUP3LqbaKkAOV3Rg12fYB9vl+sDjqLcUACmbkxSoZnSxfqK8CH+NYR2GxxrrdaK2r2Uf6zi95W5Nc6JYamizR8dLvWM3NuIA== 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=9Fh483wK1igHEF/KTuY/ZHj/K/7UB4QBbjMMSY8gR4Q=; b=M6br7UF5J/s0VbLh5QMGZalSO7l8N0B/1ayl8UtI14kTVlkleyL47ajzDHIl+1qR6ksY9O5bFB2BYmdpfDRGrxR1Nr5seWIWgZJ6kX1dy4zbu9YHF2G3SCkE9lFXlo0fvaHcBln4l9mC0lEQgVFwYRVvlbgGHQzHK7qazkgT1r/YRgnvid00R2HBVO/DxCFWRI/59P6vaoWYg8+zm/P5UldasfsyugYmGnpD70bHYAhe0B5JA168PS4+y337tXF3M2DgTxQIooEKCpEHfN4TFJL8T5EmxeTqEUYSaHbM/GZbJEZ6ys7ybYsC4ZA5vWGM96dVCdOhUARBVNLRJvjCIQ== 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=9Fh483wK1igHEF/KTuY/ZHj/K/7UB4QBbjMMSY8gR4Q=; b=JlzmZhT4OaRweBsQM9AOW+2+iOxMiFTRY4Z97/KjNEKEolP3KNMDZNc8scChX2fREP/cDHktFHX6SqLHBErk7JOJCF9IxQFjgz/oZkH2maRrdINc3kaAewtqf/k7zr8e8NGjHGHNc076IqPhzrtmkyhk0Z0vxtkxB/AgPx2/n0yZb83ApAFs+Jmv3VTj4cNBCcnpQbp0CGiUASGJ+8n6ZUPT+Ohod9RKFL/SYcOFEM7/L0ZRW3vltZ9W5t/8WHvh0qXbmPPLVxsffGwMAfO8chkMUVV8+VvnV99b1JSFbKQtK2/RuSq3ZTfuPrU8bddiWcsqNi0RMBjKvX7YkVNIdQ== 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:37:09 +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:37:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 May 2022 20:36:54 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [vsWzEsPqRTJfbubq/um+6pZOCNoQLx4w] X-ClientProxiedBy: ZR0P278CA0095.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::10) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220516183700.616263-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bed393b4-1af1-45de-a19d-08da376b1528 X-MS-Exchange-SLBlob-MailProps: +LiGfBxqLEsnwJhcwgfZpZbyYDwgiuTM8kepuFhbZpEnSoNi+jLyuLWSA6NIUoot7GqxNjiWLLEr0Q3jdADS606XAxQpxYZxhgJVchzDMW5Eklk2JgshrERpbE/UB8e2cBsRR8Ar5zf2TdUTvpEaYYSXsTUg0xR3qRTZWvSGTJNgV2yDH0BE+fJsoI1BCKH0b79gR0CuyUOgGPfKj1gfd8cByuQEIKsAIyMsK7PfeJ1WrdmIICcAk/28audQrxOLM1q0V+6d6PPmletVNEa++gAm/lbEzCaWQQ26Jo7i+0qudM3PrloRKMfxEaBlaZJ/c1M4o3EHcsGLXRHh/84bKUznyWxzYxLFOzR0vWcvW9gtXskaFBffD2Sxpes2kPJ4rEfLSlzYcYDOJZxd1fL/ysjWMXJFDQgrTyfAzVGtih87rnClRo9Qzah/OUiWxy0T/6JOOl6WiBZTuBA7lfyaWW5dr7TpjOl02+/+uKAlTRBjf06YD6A0tTtmr7In6rl1W31kCA1FCyxovsqedFBskhz2j7c3WGKf2MurAB+jT6v1UR0A7rde/FeW+hAso+H+FL/FAXklKLOcO4eQyJbxf8oBkE9H0J4GCq4rjVD4xK5f5rCIDbreb99b3orMcT+iAlRRCBvKogH3j1cNlht1XjVeWSNSPOhQIQYSjve/36Lj6pRaWMf3/juECWnjfMsxRyNhb2hLMSRg8uT9RxkJwOFkEZl7PH9mBHDQMw0Q7MeYSVN3Nk/lvrK1wPxSmG0anRBzxpnKlYw2VATdojNed/ld6w8ISJ7O X-MS-TrafficTypeDiagnostic: VI1PR0101MB2414:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /aWwbLddKVcAWJHFRvIktVr8kWbay6cTIQMSArS1wwhue5+CcLEa/gmgv6sH+Exa/Xgl8Cv61vOe1vGxII4gBKeC0G7wK7yxeFfRBC+HsgSdTx2lqSZJqOlR7QMYQIMJPxI6Q0Ls+a+rc9fyefhwSLGOI5NLyi9mPczNuqc7b6yzmbmk7SWyf9si/ltajZxoz0bzYkgxCq/1sjCBrn8dQSqX05s9V9+DnIdiiaGPDTaPtqvNdG2+8VzeXgVo0cvkQRG61hoCYS27iCz0o6E2idcE+sqhPR6FUZLBl81sqQLbVxzNpDNNsoVcjpFB/vL4CTbBKeHIUUde8f0s1pU7eS0tB3FGmvI83xpUP1swzSCNgdF211v4mrNG3PvC91ogYJv1Zq9HX+ic0Ya6LmaNRkhlTh2Ydi8Df6hDpZjETsCqOxS3A+vOEfdBpBmWBiQwT/OuW9GrrdEhj0iROZntuz+dosodA5W0K+GJNg7wsU15+o6GsszcOzzx11Aq5WlI3w9z/9ttotdfJY3kGis+mun6DvJpXnBSxaXeZDfTkrzMcnaP+eQh097I8aFiMvynljUxR2oZjHS/QkziS5FbVQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: tLZPKvBMZGiQoNSRh1ACLomDNnPT3WS8UnqyGW65mKJ25sVQQBWXdOYQ4euhhfrvywKGQg2If2tB5Ss2lkqdgah4aRwrFdV09PlGZiz88wesAWeu6bND1KpROo65AQUcB/BHrzvZw/9jj/JOOiT1diZHAvMqLVyWcFXQ40idsYQ3+KTuCF+rSVeInyg7g41lh4/Sk3c5BJdTXijSkUG1VBJ1nDw2hPhsWM7ySHHR8NWVwNrj/eb068Pdv4Tj2AZolB9YqUaIRlTvmJLK9VFp3M+WgunKnDbI/w8HbF2SwzF7ErOpQ+hxrsMeIuPI5TL+mSr1laZ6GFmJ0tqHpAMT99f/dqSDQzKtT2Pz1QnPB1Pv1Rx8pLP3k1js3xMLlpISMAAjTwD3V8AUN8/8g6+Ou/ZKAYvJQF4g76J65YGK5/0PhNyRenP8BmT8QPwp2ONJA3bhQtpW5912nlT+7dmL8gdX3WVKQHacR6gyIHbmAOltnwORTX997Ep0zVgVb4Ew6RDjosGDDEGvfl2wUEni4aMhFpuskYUorYFLicvrqbLqY2iaGhNiYyAdGLsaYI7TEUr3nSSeyALDSqj/EqgECvwel32yEGYxePSuwUxS2lHRy76L8fQYLx9VtRQ3KZDvUwJMogB3KVtJNeXk7Ntqmy9AMQfjzwP0Ajnhbwrd52+1oj46ULhX2Cim9+tRwXs0gZ1jylO+xlNzVX3cGeYrOgaSq6PK2sEhxwaS/2wYHwZEWjsDNzTLWPaCCeMiK9H1Z6YlOmaw6n+9d3hzzaiO0IrExxtJbi39IE4utallYB1AZBwqvauzgMjVM0VuTYbrZALmIfDfd2r23GUisKzhaccYLEkFHMWX4uQksaL50Ssqhw+CPVDfC5IWyFGHp0dDhRWkhh0y+4+AybkDKkibFkjFeVFJKw/5F9z6njj0FdaFIJSWM0vYMUdMeUvzPQ8RMiUhP5yBJEldLmhxVmyoJ5KeSqhosBT8W0cMXP1OH5C+WnOn9yx1OJ4lMt5D5l1NLOkHLq9URUyZJQLPIkH0MIK1NMMIqgbbrtcrdayY+peszITO3M/2Z0SkTsIIclVZqbHxUV3gJIGlHOZcvC5Ozn7XQDoaU3EKyiK/DJ8j+aEsxhVV9O6pbQHdJ1CanEOtAeIiS0g8r0hvJ1KDczcNZGh4YQWo3oPo0fT8IMIrVglwZjje4eyWSWym153o8P0S4DR3SxancRb+I9y5HdX5rsrUYS4eeMCoVSOth44bGYAoqrDQbDX0CXsaooR1galKTknfj7mHJviUEB9ImF0e9KTwHlebl9QVDlwuy0e10sBKgIoON+TmqrVeQaht7zMSVsVWVFVxuSEldYwKIHAUzyP80vVUvO+xUg99zHAexF9WicBz/2hAUUAMVe9bovXvd7lWZq/g5pkf9R/Aa0PKW8pjloPZ0N/1QIGEKOCLxr3qTS7fOSSzdj91es/pOkax X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bed393b4-1af1-45de-a19d-08da376b1528 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:37:08.9546 (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 1/7] avcodec/error_resilience: Only keep what is needed from MECmpContext 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: Q9TqxzUU5Y9p ERContext currently has an embedded MECmpContext, despite only needing exactly one function from it. This is wasteful because MECmpContext is pretty large (135 pointers, 1080 B for eight byte pointers). So keep only what is needed. Signed-off-by: Andreas Rheinhardt --- libavcodec/error_resilience.c | 14 ++++++++------ libavcodec/error_resilience.h | 3 ++- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index e9764f8d96..f957c68d2c 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -766,12 +766,12 @@ static int is_intra_more_likely(ERContext *s) } else { ff_thread_await_progress(s->last_pic.tf, mb_y, 0); } - is_intra_likely += s->mecc.sad[0](NULL, last_mb_ptr, mb_ptr, - linesize[0], 16); + is_intra_likely += s->sad(NULL, last_mb_ptr, mb_ptr, + linesize[0], 16); // FIXME need await_progress() here - is_intra_likely -= s->mecc.sad[0](NULL, last_mb_ptr, - last_mb_ptr + linesize[0] * 16, - linesize[0], 16); + is_intra_likely -= s->sad(NULL, last_mb_ptr, + last_mb_ptr + linesize[0] * 16, + linesize[0], 16); } else { if (IS_INTRA(s->cur_pic.mb_type[mb_xy])) is_intra_likely++; @@ -790,7 +790,9 @@ void ff_er_frame_start(ERContext *s) return; if (!s->mecc_inited) { - ff_me_cmp_init(&s->mecc, s->avctx); + MECmpContext mecc; + ff_me_cmp_init(&mecc, s->avctx); + s->sad = mecc.sad[0]; s->mecc_inited = 1; } diff --git a/libavcodec/error_resilience.h b/libavcodec/error_resilience.h index 2187586618..53e5cf2621 100644 --- a/libavcodec/error_resilience.h +++ b/libavcodec/error_resilience.h @@ -52,7 +52,8 @@ typedef struct ERPicture { typedef struct ERContext { AVCodecContext *avctx; - MECmpContext mecc; + + me_cmp_func sad; int mecc_inited; int *mb_index2xy; From patchwork Mon May 16 18:38:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35793 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1674491pzb; Mon, 16 May 2022 11:39:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKgU24p5Vfj0Xf9N0IwIMD/Ix4HDRxWiu8Xe9DEWjxktU0eXO4SpAUT5U6Au1ybWhef3h3 X-Received: by 2002:a05:6402:280a:b0:427:df14:d6a9 with SMTP id h10-20020a056402280a00b00427df14d6a9mr14939011ede.139.1652726360602; Mon, 16 May 2022 11:39:20 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x16-20020a50f190000000b00428679a9e4asi10881445edl.122.2022.05.16.11.39.19; Mon, 16 May 2022 11:39:20 -0700 (PDT) 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=PBwmTC1C; 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 E955D68B1D9; Mon, 16 May 2022 21:39:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2050.outbound.protection.outlook.com [40.92.91.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5E4168B1D9 for ; Mon, 16 May 2022 21:39:09 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZdO62/Vqn/TueoNYQrbQo4GO1eosAFmtMAcCIP5KKzLOZ6vKNzT+5145OqRaNOEm4Vr6pa7PrtNG/2MShpq93Ih1MVFpKrh1cdQE2CqtY1VnZOGqNa3zfl4v6ed0sImcqxd27thMTf4EMiFgNK5gd3vCax9yrnAxORAaopCwj8x+3d6r7AQPVr6gNQG1Qhq/bjzP+EMN+D3oFpd3IcDkNEk+oo5OvUDJPL45/JLc3dRcZlkTKzskyDbW3XxkGWPY2eTXN+G0zmaj6sgl9d6ODa+wRLItNsRIQrGcii21x0vnfdpLVlNVUkeJPKWrfRMPiFfTZ82MiINU2UUcFMREjw== 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=EJMRLnj9xH38jLN4PTVBrb60qmZWcb5+NacKQlitFnA=; b=XRKGk5E520HnjSUe05DLSsRM3K6WmUq9rOLf9EVnh3IaDjSXcOOWOHMSGmH7SArmbwPZSXf0uwy21cTy4beCUhx8plqhletQp8b59cZsFnmCW5TvYpEVz+Jyvpvzgy6xb909ZsEykk+w8LMPAcQ/crSjWTcj36WHpYWQCE4jIGBmfIKny61UHa2LLFuzie6inRBvDwdAf3p7W5yR73qQGih7VPPpWdn3+/mwO54O5znsyAbbx0HsalsQyLT2oeNjoW9eiLPrJwSLAKmvzZmvBGCQgJtEfO5Ln1o39EVfLbSjXtwRzcmnEbSI1k7JuZz2iapDesd30a7ziJ+5Lqo2Fw== 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=EJMRLnj9xH38jLN4PTVBrb60qmZWcb5+NacKQlitFnA=; b=PBwmTC1CHdF0sJYyDa3+S0VIW7Y2klbIwP6B51/oORg50TTXIG9pRSEymJhklWMcYVy6L2OUTZkOvnwmHBinxJ9jPME8n/lMQ6nigpRPEgR8m+yjL/jNS7uW+Uk+6A46fin7FulM8FLddX159PHktoC2AhWpJ3tpwD1tkcb/W/gXBFNvcqOg3NEEyjCy4CzBRAn+wxj1SM4zjuzVkWkhwKbIxqRq0oGxNHfBflkiYs8d8NTEOIHBKRSvsIsdLqMuW7Hs99VNyMLHu/TFYJSPBAtSFr49+YTmkONaROclax+3vjtnmBqvX+hNW7yaYo46RpV17Boh8tIOLjyHGkE05A== 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:08 +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:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 May 2022 20:38:55 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [bUR4yamH7xOJnmzENibkBCj9I5LwpKw3] 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-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4b7ea19d-e1c2-4c3f-5dd9-08da376b5c85 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRAro5Pl0DReDVvFi4iRqnNvCGv3S9V1sLdtw42FiK5i7i1M6a8XrIO1q6WY9IcCaVDfZbtzoqmCZZtk/pvrnPrNtwLerzPQW30KegWNLMPHLDrBsZGthBS7ZKe3eN+Z+x2+iFyJbaxQQyhBYg5QZpwOyhhvRFbBBrxCFEwB4NeoJw/4+SwT0sz19ml3cIvBSHmdFCvbeW6nEZ9C8Whkm363Al65mtrV5Sz298xnNIg7KncugjcGutQz10bDG7g5EpQioD1aRhfIb/Sm6vuXGHDTbhNq2bBKcO886TBd+DCfI4QYG2GQQWLftp2PNYo393mTAPLHq13YsJda2pfzgBHLy2fQcLcwQZ9BkIK4yrd9SDcFqPEfFG9wWhEvDyu5yM2Ll//zXB9lokqf5DLC7c9Fbyyhp9JBMJddqx44yiBYlwQIlv1JJX8sjmip6//+TSA7FnBcqWJz6IuAsKR/GaubB5mkH6VBJs3spL7CYOtpVEvAh8uLdf7z43NkGlEhKd0Cb75RE5MWnjGSNJj5I/E/3XHtKq6v/FNl9cycLyAxR9+JnckvkBpM4h+oJtcjCBtYxC85ONqRO6FtlfZmjt3kMYkQLSx2fGgzGkcrQUYfMwc72DRf+d+2NqidvJV6Ru0e4ZEd3PcfCfwQsr7yZmyXzBgEtDpW1gif9okVrlvAOXTKdxQkY/qqdDwhXVuj87u54dhA5jTReYCOCWMQC+67uj6JuEdticQl/pOmA20/UizUTAIq4RLhF3L1C26U+M= X-MS-TrafficTypeDiagnostic: VI1PR0101MB2414:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Pn8tkkC7cZgfdKMKui4d7ysEVNo9I2X3uKONgxp/YYK8S7mxL5Fywa0aER/KBdEYmx8MS8WlYjjzywp39ZZJd7/ChQF6DryeltrdmSOC1Id7JCIs4zRXi8/D3Q3qgBs/O9HL8FyXbMr1WKp3F2wRhPHXyytWo/Q0Vjwq+H3E6PvukyLxJl4c+m0/xQPg0zFplpjKGaFUd48nE/AEY0OYqALWdpztLsuVr+8k3XOw5CPaq3loVf5giWKIyLaS3lYLPl6ch1PP6g13Xuus8suCVPAQcVPX+NJonu4kLolpkkFIORi0MyAipsygpGCwd6H8sX9tR27R49Cl5uT5qCRRx7u6qsoT3sK3JyWXWec7d3Nb5Z8MnplfUUhnmbBl3xW87M4rOjLvaJZubieP9DstsLVQzJ6VCOcrG1x1f2nYc50tk2+Nwe0tXFk1xrPG4vFlkosP4QoyHUFnWA20SvPQ26qHu4A0ymS9MFiJjn7s4n54orkN0BDvZnca69St2rU4HRZ5iZU+T3F/tGaj31wUecu2tlKeMu7nfdBZO+ukMvKRhy0hzWpbzGNwBu8G04JUHOIZioaZhz40Zh/8WOgjtQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Y1dIs3t8QUAqjsQLxp+GIQw/vIri0zQlHykwfFRdkiMnogzeTCoPF0jDa9zedjrd3Xtwz/Co7DLmqVZorOQqINgA1ImSqRFKag1wHfWJ/8/6XmN6VbWgSmgBd8jft3k4wy0CzVe97hvbjQoDUs4Hi80RE8VTPow0vyOy87qHH9FCJDpdpkCBW7pPHTFIdOw2jV6T0Ppf0c5xX/AeWdUBImkVGZ8CRDTIJeGi0AfgJhMOXWo23IRjmNFQ38zvn6V4+fzFWUWofjg7dvYELXx/wkLhvrA2JlTufILh1o/KilbKGU3FZXFRuN8K0M6oiTzzvIrX9SzG2/FBsjSGhUqtJX+d8+cygQkeFb3kFaW6tYOwVpkC1qGWQdJ9g3WK+pg4mkyLnBMMZ5SLCh53oM9ItTTXqpyWrOkhxdB5lMMGx4z/Lw5UQHZf2qvZLszCkjpjAErJ21qd13oMbcn7BAuwxFfotbSDMkoamiz5tLE5sZ7ilKO22euOBfgVpDoGgRzGks4oP5v+wOAOmTpM6FrHh52Gs+/gJ22zIzgk3w/ZF7gFROYwG+QNmlM8vyHJyaQATaW5cuSwfQEBB0Zx+lyDLORHOob4I9/6qJvMrttftQuvjKAduEOvBwwXYw6mAQrnvn2nqB87PFIqEjkyWNsBIfdwKMcsSYN+YCmq8+qx9gy4cbPdrgvm2ayO0SBYL7hi3mS+zm4qBy8AxpK0gy+dJsprk5bth/QLuP3qyshyBoVt3MYgpMZGfhtcm8QUlc59IR4xOXb4aS5lzxViKbDUEHvDL9Ud4twxu9kBJ7+q/41klzuHZXMN9B82YRlow4X/ccTN7tTiZX/tf5e44kwgh2ss/4XbMhDTYn7mFUde9Uei31eQr7vP4BOosoOf49GuXE2ylhi32hAV5BzxPjNrMzo4V2qd2LswD1U4FiKmqztNzeJRaxDsQ9wovN/No9Lfme8OBjkHxwy+Jv2RnOUSi/ROwJ0A5wAtWjU6pNMpu282koE0PGXAl1jjPdaa3s4ErLbNmQSh2lnUrEQIIyiJdnYcrc+JDFdWSqzHe42YFOBM1DieD5cdt3wNv3g3ZUTOzoUxtkVXLtHDquELQhyLJRsrTSYP7OVo7xFhYg97npyZSwPWHsNJjVpihyrdhcVOE6PfhW3p62FeWfna5pX63K/V21/XMuNvLPU1jXrcBOgEgGgM++ruLoYSiG3ZFCeFBGUXwhkxEufqghpyd5SyeVTwG/wCGif8losomrLzu/0ifFhBmnormIRgT/64KyXMYZn58TC+zdvb/KIW/+lP9JmteM45Ib6Ejr0u57yUweG5j2FVb88xtGWo/G/zagudXXEseS5WcV+Sbkcyr6Iamp2I09JiuKaos68uYxAJkNClkB7G39ZP5AiBNuCg8BAQyOL8wgh2E4syH+v2i4+ggX9/Vb+UVspFJ3eqaOmkdo+ytMI7fB5nNigxOUvAjmq6 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b7ea19d-e1c2-4c3f-5dd9-08da376b5c85 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:08.2900 (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 2/7] avcodec/mss2: Remove write-only QpelDSPContext 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: q+ONOzWx8+TE Signed-off-by: Andreas Rheinhardt --- libavcodec/mss2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index ab42d12217..228f66afc0 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -42,7 +42,6 @@ typedef struct MSS2Context { AVFrame *last_pic; MSS12Context c; MSS2DSPContext dsp; - QpelDSPContext qdsp; SliceContext sc[2]; } MSS2Context; @@ -837,7 +836,6 @@ static av_cold int mss2_decode_init(AVCodecContext *avctx) return ret; } ff_mss2dsp_init(&ctx->dsp); - ff_qpeldsp_init(&ctx->qdsp); avctx->pix_fmt = c->free_colours == 127 ? AV_PIX_FMT_RGB555 : AV_PIX_FMT_RGB24; From patchwork Mon May 16 18:38:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35794 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1674542pzb; Mon, 16 May 2022 11:39:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwYcw6OG35rdORNa2Vpcm36QtWJdtBySJ/34LztQgidDK7E5ZYszHFSj7vUl4LMoQxQPGYN X-Received: by 2002:a17:907:7e83:b0:6f9:1fc:ebf3 with SMTP id qb3-20020a1709077e8300b006f901fcebf3mr16909301ejc.403.1652726367752; Mon, 16 May 2022 11:39:27 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ss2-20020a170907c00200b006f3b8a62ff1si130214ejc.123.2022.05.16.11.39.27; Mon, 16 May 2022 11:39:27 -0700 (PDT) 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=f931XqQG; 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 CC5B168B413; Mon, 16 May 2022 21:39:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 ED05D68B3E3 for ; Mon, 16 May 2022 21:39:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EgSKoiuCzKz5VaUHzEE23DMr02EO7K3l0wknPsC09QNZ2OvZn0ISCT0ma62Me6l4mGS0WcHBElwRtoqmz4s36/u73/iCjys5Yzru+n5iXH9UPnYlfHj3Ei/LFpBJ3PGh5Wt3ktuVpJzEQHkgTZ0FnGqTBjqsv8+j5KL9Lyt3CPNjk2x351+lQ3MqJE/QwDUR9GsGSWCjuPOKoVTIWf7hmHQwuNOekETu2ulyh6MgYCsCJivdrl4VNPP9xJYGZzD83SBOTRyB0AG2JF9gt8eFSRNe1x78y/BbQ13wBluiNhVMPvUomVRE+zO6tzh8XhO/3pcghC6euWFA6dcBViUB2Q== 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=pukfySPsoKK/vjsKqp9N1YgtXp6W3Xdtb30oVa0JXUI=; b=DB/ohjvpfru7kaiY6veOU+nTAcpWWkaHz+M0rCpRx3Q93l/mXJhZEvQVVbxMydoVRLeRC1k8EA21bOK4m+GUQl+ZxIqILv3zDc3zz7P0pYNXRwlGOQ6FxCb5MC/XCt46a2Q7PmjHmtt7uRePDqbjrs6U/c/SKImu9YkBSXFeWO/4c3gy3LT33RLjNAVFamPZlNa5FwFegf3jeIcfAN/8bgUTTf2Re5nGU8WkyEKSbl7LrKaXd7HR3HEnYy2DNgSFHOar8Q/sZQ2WwXGQMhtCQdNpnM2hn1bwrwmg9/91DZk9zkopG7mMaYUYPdpnBRTQq3d3OVQQHIV7DC9Tvc4hCA== 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=pukfySPsoKK/vjsKqp9N1YgtXp6W3Xdtb30oVa0JXUI=; b=f931XqQGg8mljwE36bnDs+Ln6xpu6PRGvqd3Yv6S7+OUqs8QOHpflOUiMyacE1Ldq34B95v9R5+CPONOZJOWzwcJIIT2wdMggDCQmkulITKt9HpUeYVkB2L8TUrDAGZn7XtJ43MUuaQagYchX05a7F1SNBJ/efnPqNuAiwH/yfZcotYl578YkLdOLHXMmcPL6tl6z445SJR3tBMtktUFn5jGc+wj6BLbNlAmFPZpQhoAqgx4v/VUQJM5PIPz0ls+SPD7JQWW5DqVmhsQCCkoIkuS9lmXPdivOVEYhV8WnBWsuf0ZNFL9DPCEpKFhUD+CCr85fuSHaoTGXwYpxprZMw== 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:14 +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:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 May 2022 20:38:56 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [tfNLSRWYPqrMo4f5aNFdrZHK8AlPPZQD] 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-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3062ba2b-eb4b-4124-0bce-08da376b6052 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRAro5Pl0DReDVvFi4iRqnNuKgXx/3mV/Vp7LMbp5BSCAQGE1REbJonj2Q7Ht74hclHEBJvMz+0vft7fnnujIwQwkzqaHpxG77x40pa/sQntJKFdiF1WCuCvYXnjntEQSBQjFNqD1q3pMIflBcbvZWfcMLdlbUVJ/JNzp/olQd9CetuUPaFFkOecddP3lXSmIVMM6WWoGV4XoagPACOTt7ovff6wYHalTqCRFOAMHQZaIT813RRp8xnpe0osYUGELg9aRoFCyy2zxnsjuNtItXQH2mmH8VnwSMEXguidb3eWHG5SweRonnEJq/k/yjZ+1iF9boBwdpGpQ6lqcLZnNgJ5mEJB+Zo9lCNlhB0tOLjdw/Rm8letgXkSCmzdzMhTc4LlUjRVzKOegWpFZpRAWVrLXmPypAS52X44Nnqe4TXo21MQwLHxCTcrre+NkH88maDlb2KYBNdWXn/XJk9oOzvmdqicGXByhNEb+9i11xxrYtZhUa3YCIrlvVTQNmom4ssP+pJBOQ7LOEteFsTULFHZbTegzaMfMUqFdFnUN3U0c4uNzcIc1isU/FeInNuGQe0WpEY/1MjLqOEnLOIUQqJssiZLaP1RRAOROEq1qu4ZeovCVehRJrkO6Y6JxOYAYC45ujZBvH4FZdk1E8kytZRCjOuVL7VV4Yi+b4BsgzydqLhVRUkM1KRfGPvLrSspHGXDs9QZNTLG0k4cT8rHzkcE98CWnbmG2ffGNEME5a0VcPM72evHReY1LhByNAO3V0= X-MS-TrafficTypeDiagnostic: VI1PR0101MB2414:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: f3FQP0vWp07Pc99tSmmj56Y89Q7itjZclYo9vR45WqEkC+fpYL9DfvPmfP8pYyBF92rFDsfnV2ZWY37tynfXKMWb2qWNaHQAID7TxcAx8Q6FjfRoh0AUC8+SYP0yy+lH1Bt7lPRWodUk8C6nOuaSetZe7NAZC107esyXn/wGVwOqPbXVGzF2S1vviIhsDIkn7PZ7OA9PvqS7QDRdQ0e9XjM4abKfDNdupuSqT7x2NQXMSOScFlJmI+nJOP/gMGArXSv4Z6j7YHGm22SyZt7rto9cUXdaIGgSehdUIXk0fX5hUm29Sz38zq/vA187x4/Qy+qiYLQ9jb+SoVR7JPhDTwgfJ/XQJhV9qI9sZy0oamnx3dWy8v0RNzfmq5lFl7Q8bvGaM4N38mpLxdJTpfyFbmpexdY6i3akMGU31ZKhBotk1NEimBz3r3Yh5cUZNFohd43+Dhjd4txWBMosh7+wmUjxGfyMqnwtFeD/o9n1StCdQBpfJL4+Trin6cKVt9CjPmWxW0i3qJm6EUdwc3YxAkcfPFENv/sclk8KVIZPEs+IABwh3EqeEhvc0Dhn2EaESdWPP6Rtq5s7t+B8M19BQQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: B5KQyZN0klCEiTBswCN4kuEcfLA+PaqWOTjLhmeDVdwktZZg5ms24hBypYdFBLWmHB1eY43sDwq7ox12BawJJNr4vZGtujIj4t9sAb/zaGn5ZvaUCjXd+tDdxQODV6IaGnLosCqU3H38RXBhQ2V9UTZBozyweWHvaJMovxXydvqaVOW4neISy6NmXFFvuEG0f/bjT1XaYMq62FRN5nQfdIPkCy0wj/IBnH6oSuIB7lChlbNOhv4ufoEQrVil9iFaW1n0UH3wJFAWv6NVcII0jvw5gryQuiCHRoDrGzEzWH/h68a4sZb+zoAfNMuith+jaDJkLwmr+1qJhg7UIu343MBk/ttV0H3sNuTvdLZCq7SVLWVtqzPv+jk7BG+W2d3jBLRoLa7NR+8zzuLM+wCNy0y1pfgTh7eirKAKuODlOHmuFC64aFD2NqNFx6e8INKodWhOCgxfawxevP16jc+zgX7Y7wUiomKeNuuDjVnMQkIZsG6oOrgaytAixmfV4vTq3TDqDbMFScbLZAfQYO1sPH1m1d8jJBsetd2K6jTKIhBuaZ/LVYlbqmuH/sQMDHgPf3UrDIhWJRJpdVOlItzmzayS2M3UyMaFWo76ftOjIYKKOSsbZfMAClLLncGtYmYo5vHaHO7/rYI8RjU0rVj9qfu6bB6aHqgOUAKM4uwLT9CulrqCc0kdSz9js28u0LwfTIUGOwAA3Zo/qX0OnK4H4O4pRF2cgNzpvGLnlFfM9EFkkz2VecdjkCDhYv4fzn23B6EPvyiGozDvahGwMIGPArpq9GaxWAcI9PZEw4VAbphI81rMrpzXZXTg30HQk6wH4rJtLC4DScnkJgghDzTltcb4nM7w2PXhlfnLphs8cOSThEqg/AndCJ/N8JBSaJXLGWuIjU692jB2WUNsPUyEoxjHb3WlFKTCQQ9g7DXYW3z8uW0cwC4jlF/b3nivuf5FfQqnoIzizFTHXzyspbH65mgdkS4Fprl0f36SxM4n1BOBia2Zes85AlN3RtZfgAO3I2UzK5AYY9DaNvbv98LkvKQ0jmmiadhCmQRZ9DIek9iKHxS+NQwXiNCNyijZEicz9DGXgr6umoMvun3ghf3hq+CuWgKQFyEpxJ8caO0NBbfyypYPOroKTLuoVdEGnJzcQNFjkaiSQC4Q7j5jN9Xgd0+AdaVil7WZc12YewdR0bSOros6pY8t4d31yMSCO7afH2VsPht/7xwh+K+DLgfWdz6Lph025jupZnDjw3BW+qMGiCs+B2GGXY20BGIRd9bwPzQ8ifbpb9lLJkumdDz6Jv3wiEn6QZRS8IbgJcbmiadjzPo7/tckxhDkjTjrXw74uAHFnxt9uLDOdgfxja3CBmpm4mbOsKEkarAtkmv4tJgqLJP75EWPBv22XZPfiXLK3FFEYjpUJQs+8dezf7VfG27Gjd/RvH4pSRgeC5aN5c3h6eHrMriY0oA2MaPagqMl X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3062ba2b-eb4b-4124-0bce-08da376b6052 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:14.6333 (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 3/7] avcodec/mpegvideo: Move float.h inclusion to mpegvideoenc.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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ahbCW5XQaKqS It is only needed for the options in mpegvideoenc.h. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideo.h | 2 -- libavcodec/mpegvideoenc.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 0f816e5807..a832369f7f 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -28,8 +28,6 @@ #ifndef AVCODEC_MPEGVIDEO_H #define AVCODEC_MPEGVIDEO_H -#include - #include "avcodec.h" #include "blockdsp.h" #include "error_resilience.h" diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index fae41457bf..a0e8913ea6 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -28,6 +28,8 @@ #ifndef AVCODEC_MPEGVIDEOENC_H #define AVCODEC_MPEGVIDEOENC_H +#include + #include "libavutil/opt.h" #include "mpegvideo.h" From patchwork Mon May 16 18:38:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35795 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1674584pzb; Mon, 16 May 2022 11:39:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXnOduhbUtEyN6QJ3TgVl5+rQFV/IIEckhaOb1l4Xnhp7m7Cgx4/w8uUXefhsw0I6xg1wF X-Received: by 2002:a05:6402:335:b0:425:e3e0:5a90 with SMTP id q21-20020a056402033500b00425e3e05a90mr14702732edw.14.1652726377360; Mon, 16 May 2022 11:39:37 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v20-20020a056402349400b00427b5cd456fsi12296645edc.0.2022.05.16.11.39.37; Mon, 16 May 2022 11:39:37 -0700 (PDT) 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="W3/OW1J3"; 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 A65F968B444; Mon, 16 May 2022 21:39:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 1703168B42D for ; Mon, 16 May 2022 21:39:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UDB/B6TXnTaOd1NtuNSpgEcLhzrwZD0+hsDBwMsxjUMULzl9twEKdd8NM9aMbGPWB9hNglmSaldUChmGv4C6owUJNplSbV/d9VLfmjgy9CLUJEbIm9u06VsNnvmxiq3jrEJvD4o/0+QZPHPO1ntLJVQidH+lPswYbhNEbwdhjQyKAVmsWdAxR6IGVJLa/B9UB1VNiKQRuMkfu92a6Fuxdw0SKDFaGLe1CHAtg+pR9DP8gzcIFT9hZmDiRA5Ev17pW/RJEQIGP8nLaI46dUDcLrKUQslqz1JbpD77Uu/5JlXKv+5vCs4r+xVz7rDp4OpsWLB9XLHp/hv1ez7VM/Nuag== 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=HzBHCsmhUly52nY7KCH5iQm/aRIsVlr4dUy680iCvO4=; b=U7/XTIrFd130rgUuc5v0WyYn6YOTtYqLYj2y2RV3uip4ZLy5HWCYNnt+r0+79cRiZN2mMNa85GmndGVlp2ZmV0cUKEYRF+Bu1wxMlBMuvNdEucN9NwJTQhgoZueQsFh3fxlUWozz1NoGdTaFUidC/nmK5VEC5d1WYJVAVOsASpJmc9/a/Yiw1WSdme59rlpQFDp63GN/QC4le4MPYTe+64X3Zk9lxaZDWFtEGAgdfG3jaeb1Av8N6ggzUeN1A5CS3XCJpdG8p7E9m+iEsEcRnqLqugmZbzWpmdeaG/hX3ycJbuLxbDbmsfwdJt1sBmyyfDYwNonv9Qe61K5w8K175g== 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=HzBHCsmhUly52nY7KCH5iQm/aRIsVlr4dUy680iCvO4=; b=W3/OW1J3DwRUZhxPuH77r674EDM1OFnx2LJT6IKXg2cZzd+9gnamOLmw2LKdcZyao4jfgVxJ9hZZLV6KcrCFX2di7HxXsDd2MT5k5dmqwtSxenG5J+rUalqxkqUPS8P1IaZgYiPIfBjeu8Z8on0+Op/Nh9DqiVyvck+oe5yuHsnw+YQ4MTrPB6+Y6h3MdrCz5QUJJGIlw12bmhmwW05cBLkeMnEj0qPN84z8hCx2IC5ct8dHOP++OifQCL46WMWA4P1oNOQPLFAnoBZm2dEDnWAs0riORticksMKTxTFJTM8+eBf1quJUeO+zT16I7iqBi8uv6raA8sTApoXVQwW4Q== 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:18 +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:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 May 2022 20:38:57 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [YmaVCxYy3sJx/uGxNy9/bXrNdUFLWeMh] 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-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d02449c6-4a6b-4bce-fc77-08da376b6273 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UI47HzvBIDxi2oCcBJc531jiOpQwxfv+LGUj5uC1QoqeC9lPtoReyZOvinpic6+ZTqIKklf9EY01DTS7Dn9N8kDeL5XBcz55FA2kbhFva5gF4liDPsLvsUwRkrMahgfel4RxdqDjOY8o76oj+lM63bpBkYzMa+5LyAiddJB1H8N2oa0S8his084Rk7qwQBS5IIsG4bRVanPIrRcXA2y667Ly3RAyb5dSqJv7Od7+ZS49MB2EncglOBFcDrzRu2PQnBHffgGX8+MTTr5SJyLTWfg4+QWrTS77stI7DCrElecn3kQECXFW+N82hkg1Kbn0BOPXMfQAh8gOP2AdI6zSvS6d/gMA8DYb6Nnh+2O19Z9e0zGW58XirjDopCljGMH7GVnZsMC2x6HAVg8FEJ1AC4bJTw6w6K32bWCsr+3lXN12VabdPg5AgGeJ+YeNv4DzdImGB09OEcIuviwGR2gX0vkN23/T83Dq4gDaXnvT+EmTFXJLA/YyBenMuAti4JgwDj/vpE51Mlg9M848RSqD3o+ySUq7pUZw2KJbeh2LZAECRAc1UDZt3pSTyAW7Yiz8nsH++86BxPIf36A7rBLs5IFtNrvqQd/9jnZzOFjsJrHEx5vRWdwC9FL6+rF9xLeQyflUKpxOh/ophpAzlbj57Bs1XE7LtA2eTh03Vp/xBqK3+xCXMoKZHGeXjrTnP5dp8OtJWC8w3nRKQ== X-MS-TrafficTypeDiagnostic: VI1PR0101MB2414:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x+OxPdMaszWsCI6orufSHeszO6jH1xP9tU+HGzyu7u3R3eIV8gJpi1dgd3YxwcujpjF8C7S5+ZFXiFqOFGTXKiG5Gdh2ut3rfNgj6YghLmspSKQSN1ZiM93okZtHoKahXjo9yl7my8vrmQj8jJlGeX77bS3vsf1TUIKH9fRD7PcwrEPm5bQE1dWyK+Lv/Y5IRqfGiKDwaqPZA+40YKe6eHVUXse0nRhfkQ9U118HJCnVpeQQDqpue7nneilpfewz/h0Ucla58+K2NYP6aW48iBKnSXGs2cy47KgmRkC64M7nxEP+cbnEK+T5gGbRAkyCwUaUeg5hsqzR1XwvQqiFC3yXzerMw7RlIeTXVK6qcfNuaf6W3MQ9W9dmwNU4EvsvQSV8jRvo83iJIQAc7RkU9GhK7LBt9smnx8AZumyiLadUrmCWTkSmTPSiknr+PKS92o/y05W9B4wH0OvKasF9ZDpy0Ne/BvTTIS/ifJ308dAiL9T5pkWStLI61/WqTNr9yxOmi5L8cFWWVUI/kqYfY4w5s2ktm0b6mjd4cu1Zk3xM6H2hEstYAyn0VcwKnV/FykO+iseuUYvY+7QryXBPzw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Tks3qo8zm7CggSkR7tau6yA9btUlAZoKoSVvjp+lvyINlRD8B6nn2xVozl+6Fui/f+bwcclp8Yqk+WlRqTonrn4yL2+G01kFaXkd0Sp0fDYhrALdU6m0RDv90+N2NXjJk6NQ3AurqYQJLHord0pdX30lNP0AG5Zu/OUmxgAovf5+9qrX9+m9r85E7601d1unLahFhmgqfjDkwURjVPosm8NUfIPJmiqP186eXnpWez9RUdh7Xb+jKQGL95X2kPlnCI6xZoURyxWwyV4iAi+WSU+JavrAxnjKiym6fNN/znvlKdbGaLA4cR0oISdIf6fw2NB9q35R4ETMl3HVZcMKQlEFnIT70j/UdLp+VJH7F5NxerW6f6I8LyT6oor5QDX5eB+g9gBHlmZeJS2ee2H6j4lX8m1vADoxwUgINE1U/vh5VcXPiZCuOO8IEu/zY/MXeZ1CHYMyXZkqFET5AGdRT96oDV/6kh2g05QJcqajJqLHq10LBSRj2bxIOOX7/G7WVkq7QTLGXC6NQ9kK36zwUYjirFEIsjOtqZ1hgKIKTxSstCGtr1SMrGoBuhsjiCq7fboc70Ho7khLFmPHWuApnIVk52v3Ikua9VUpNLKABucPOClRM3wiHQ94Rf1WhZsbMO7bVxxNlTVbYGZvhhEXr9T2QJo/Q5WfaHgfIqEPXnM5apckT0OKiLVmLldWpl/Y9BFDF/KGFtKV3LDp7DN9/HK8H/YdcJ5obRFWhKRhnTJndENLU16mb9fRL7sVGRCVp+xFVaQpy1Y0F9lElkalcVgKdvGTEc/rWwGUqtYLWA5LQHTvR+ioWjtQBUAdNKwhx1LaceEhvNVmVU5oXhGqhnykzcekYYuBSrKrtNq8P66b/mcQ9ELqqx24jJuW6Z4atpFQdvBsl5FQK1atbipsN9CSQ4gKoo/T3Ji9hXcpN8bnKSCaKRg0vvouoRAyWtM962WUubvj1Lc6Pmi3+gNlX4ZaDlU5i2wVO5VjNTi+nPRVCJ3SdBEUTpqfbod2VhIV91skaW5hEE9S4Zp69/ENpziF9mnjfLU8bA57RSij5s7FfyfN8cgDgKWBhLl0B8Uj/q/8SMPHxP4c7FuzZHtG8jphAk00H2BT5Kj/ov3EAyiY2ZJsksyUeuubRwFtbgB1JeNfgIdQMInCVJmQ8jx9ZkysT8lA8YpQ65QnbgFfHMcboQozx79Nf1u4ayUMSQ/CcqJ2p+dTCiSgWK0vFJlKgnchNJF/+yw/LAzN1SUJ436rabI52RXvy7etiddqVL5eUB0J4L4n6Na89bW3Rgg2qk6Dra+gHh/Jg0IL6FrqXQRWUeGoC+e4fbAIK1IJdU29E8gR2K7VKpUsAUoyvw1of+Pi4WulAaqVp1/ozDJdRNAcHKali5zfcyCTMFW0qAPiwdlgOn9rQs6ndtQhZhLgQdt8r38oOP0TATy+0bRxhY1d4b+4HzmYat2lk0lQEO4R X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d02449c6-4a6b-4bce-fc77-08da376b6273 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:18.1330 (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 4/7] avcodec/mpegvideoenc: Remove ineffective [pb]bias options 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: EoAJX4jRkrxU The user-provided value is overwritten in ff_mpv_encode_init() without having ever been read. (This has been broken when making these options mpegvideo-specific in commits 910247f1720c6aae422723c05dac6d0b19f20bec and cf7d2f2d2134c0854edf2db91e7436ac2bc9874f. No one has ever complained, so this commit removes these fields.) Signed-off-by: Andreas Rheinhardt --- libavcodec/mpegvideoenc.h | 4 ---- libavcodec/version.h | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index a0e8913ea6..ecc389a6d3 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -43,8 +43,6 @@ #define FF_MPV_FLAG_NAQ 0x0010 #define FF_MPV_FLAG_MV0 0x0020 -#define FF_DEFAULT_QUANT_BIAS 999999 - #define FF_MPV_OPT_CMP_FUNC \ { "sad", "Sum of absolute differences, fast", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SAD }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \ { "sse", "Sum of squared errors", 0, AV_OPT_TYPE_CONST, {.i64 = FF_CMP_SSE }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS, "cmp_func" }, \ @@ -94,8 +92,6 @@ FF_MPV_OPT_CMP_FUNC, \ {"border_mask", "increase the quantizer for macroblocks close to borders", FF_MPV_OFFSET(border_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, FF_MPV_OPT_FLAGS}, \ {"lmin", "minimum Lagrange factor (VBR)", FF_MPV_OFFSET(lmin), AV_OPT_TYPE_INT, {.i64 = 2*FF_QP2LAMBDA }, 0, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"lmax", "maximum Lagrange factor (VBR)", FF_MPV_OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 31*FF_QP2LAMBDA }, 0, INT_MAX, FF_MPV_OPT_FLAGS }, \ -{"ibias", "intra quant bias", FF_MPV_OFFSET(intra_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ -{"pbias", "inter quant bias", FF_MPV_OFFSET(inter_quant_bias), AV_OPT_TYPE_INT, {.i64 = FF_DEFAULT_QUANT_BIAS }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"motion_est", "motion estimation algorithm", FF_MPV_OFFSET(motion_est), AV_OPT_TYPE_INT, {.i64 = FF_ME_EPZS }, FF_ME_ZERO, FF_ME_XONE, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "zero", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ZERO }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ { "epzs", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_EPZS }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ diff --git a/libavcodec/version.h b/libavcodec/version.h index 87b7284a95..5183deb68b 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 28 +#define LIBAVCODEC_VERSION_MINOR 29 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ From patchwork Mon May 16 18:38:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35796 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1674640pzb; Mon, 16 May 2022 11:39:46 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwSyOdPCfzXEDtepo+upqMwFGyIZauysjNemEBcvctwQ+7IBdGwYOe+E/4TQTLlYmUoeIeC X-Received: by 2002:a05:6402:1ca5:b0:42a:a393:ff02 with SMTP id cz5-20020a0564021ca500b0042aa393ff02mr11337694edb.76.1652726386625; Mon, 16 May 2022 11:39:46 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i14-20020a056402054e00b0042aa5a47952si5932721edx.262.2022.05.16.11.39.46; Mon, 16 May 2022 11:39:46 -0700 (PDT) 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=p9ds6EO2; 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 A31A968B468; Mon, 16 May 2022 21:39:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 34E1A68B3F9 for ; Mon, 16 May 2022 21:39:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kaJcm6gme7dVkrnKADAwVofnc6ko5q0NEj7lOQfgO8jJMz/CGbGMANygYACqI3N0cjhy/6G03y4FB9g7WvFTTNnQy7VaH4SowokAhhbHYtC1zeFmopqxQsR1/jLLWy433fEsU7kF/RBRGEiEt8Cw6/VDic8YVxTtH3h1B+yxwyk8Gre5wlHj/FLnkhEiVluRfHrFGWLHP41eb53uvj3jR23w/HokIxmT9ZB/CbvZFNrx1ATeuJMoDiiGmjJrSrYXx0z7hbW1zPOUxJFlyjEqxgdI0ewIMCdjIUtAoNsEvus7SG/hpoN63khY41Il3Frs2qV+eYe2iO1A7nyHaXtUjw== 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=OAyKc+cGGVCyphOzLn1HN3NZniZ33UC9XzRatEbswD8=; b=JLDZ6NFYTFGfxybeWx6DU8UQbnaQpdnbFViKUsuTIt9rLUOMidDZ/kToNy5tZocGp70hxeaP65pTlRnYXJZXqs0UZQpcw/yOUlqjvOXLc6AlFSO37K3nA/oMs+fK5lK/Sim22BKBa0eLcv1sUqjKHAO2ZSdGhEfkRT3HVuXLviPEz5qg/TxkqJtVwGxC64g0Pq3YcHfHzQJurBFqbsVWsSKBWBjLKKLmOlKlZSkTJogEhHdqgnfqmJKJYSGXSCfMyNX9qKHk1v5BEWUbW6HY0hfOIz/3tZzWruqabBm3lhjIJUMZ1el6fKP2/EQFjRucWbODnEIrkDIATK6zfOZnxQ== 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=OAyKc+cGGVCyphOzLn1HN3NZniZ33UC9XzRatEbswD8=; b=p9ds6EO2lQJoOKFfEaw/k6Qnh3U2LhHzXH+QSd9mP3bwTugFE6FavJsuZfvlwg622EmliZUAngqXCYa4fcId9m8CGJQaD0k0h8qSaX4Q2bPp1aa+Hm9g+NVN/0OZYYTDXOdz31gSk3hAolBv60N4F4tEeHKzfLVkDN5lsdtA7Q8sZYGQbl49uOFpGG3lFGzpe+FE/tcQL6AO/WWfXzZLBsmsXvxM6pnSKFuhu6V2c1xyRa+1f3Vy3vyllDlqdsJjRZiO7nkwHu4cQPalGy5Wm7sl0bSvBGQwUz+al8y7HNMDCwdGl+eBb9B1C0Yt/RKt6ASmY1Usxc3QQ3TmGHYQew== 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:19 +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:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 May 2022 20:38:58 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [NFJcQ43gjl0RTXf+S7n3K/UQ4Ri+Ci0j] 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-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: be908c85-b9fb-40f2-ff09-08da376b637e X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNW7ZO6S4gJQgGfxIlJxJzTeiFn+SbDLR6zq+fv4PWGbi7WRSSukrbyfAX9F/bx4Lp7zZV025RgzqryrGWlpZd5y/AKtfXGJnajfPxfgdWAW5wKKWAZDB40fgD1od1/oxzXAY7K82GGiVYe5lstFREOnwqL/Mq7BY0UCyrzDabzdpLXHuVrTq9TenNAv9Jb0FgaGNlx96IDpouIgW43ZHZFllRIZfGJWHiPSMXDaN9PbqeY3d8TI2kllOEPnQeOqSi4hni8eZC6OeR6Sv1ZmE+SfUQzlgr3/Mc9A88TYo6tCT7OT8K/YqssPnfin4k29/HqLEGnvE+jwyJnOLnM8QF+O+U3jDQYymjTAGWapZSaTOeEG3VzrOE7v3VQd+dHqR7ukFY4HQizZixULIGNWWU4Y7SdIRC4Bbw2igN6rCevlSGJ2hLNzo7k8T1Ayxk18LWvpiiQgy8bC90BUyVdeha0hmxhgWPUu/40fXvhi9ltzRKENzHON8VORA/C0bPCGhOa+zXJrWqNG5h+0pV5n5DPxMoDA4Ne9RtGegoWhsdlcGpY4gNzIgksk5uLkKsNln2b2f4guCbWKuepTAwRJyzEfUXyJzibeSybncxhSm9we4F6GOss88fsswE3d8PFeyCeQUAj0h7S/S6/uIXGYQuSI2QcRVkRdjNQvVeypDlcmuwq947ZpTIWMsYCWI886RtzYJXehYOlUWu3s7u3Hpevy0ArAK0ODAU8= X-MS-TrafficTypeDiagnostic: VI1PR0101MB2414:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4RFs57YG2cxheSD6eCgo5VaGdPpsMF6fZBAfAJv/jIFR5LSip4k4s+18EEW4bq/6LoYqhZXWzR7CKrVvk/64sUg/KWXOHbObmihi6b8U5UhKTkQEjz8ifQ9RyASPjPcqiViiRFkYnNTl/ZjqexGcRx/bF/SQVAMnkLtWrbi585FAW6KtBu7E30x2r6cRPkRfpn04J/sXyhKCGZysugcenqBp+Ic2yhM0XCBi6L9oJcoTry8ghys7cnR3fofTYRfEFdSlAuCwkBXGIwBlEYeFpENBM4y8p9TGZ+4UWxiqXH1qSpOjyV7ogV8lgq/5Ds2QUFszdHw+IEWCZ0s1VNkCVbw/tpHhJuMep9iJ2RfqmOX3wowCNxD8Qz/p9wnwQvu8FKzXjF48yHZVPd/mKL7sXEHicroBzMRyY4ZG8XhGottwy46XNf7SnlVFfjnp+cUixoeeiy3HJr5RNBKDXTJsTiFNgNlKRjk80zfb6+niEqZ1a3tWVNuJ7LzEobs3ubY98zFPWBJIewSIXGXRR7clm9lAWuZHCcRkP22CB182Crh787VEiJ1UZcxjUGjOEdflQbxFIxPSuif/7q6TFyT7JQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BPHPJp093rqHRfzh59z40+HR1RqxL5fhqpL2pIOcCIEcmzaMJNbU81i4UMUVWu5yWPFnimmFoVK4cy2wk+v4vNch8X/buqSR0P/ugFVtYySiAPhh3w8cOFmdJEUfTDb7f7TlAoMB+DmmMNUU/hLKE0ZbVEXMcXHKQKfLHK06cgnZI7CKS87m/uMmaTwXb7aDlIp1EOUYfxxH/Mr3qSTBKV5DOpj3EUwqh1SQmvG6RlC+WAGCWwj+PCT0hlPgqF2/DCReDj3b5nJ9SCJPlqXHE8N2F20neW3Ju4+F0LCy3OT5ognZztajd6ZisFo1EIYax1mV0idM6DolXX0qoIsKkUQuLr9qUqgIfd0QqLdMjmNFA140qqd7qd78hmiKh0tBT7+tlEzSi34O4PaK3ilWx+vjSrEGdsYaK87nFP7r9YmYg/S2VC4cWH2ZA59itWh9XUyCKWHXPLbxYxX9rYcnUBZjqK80AViaUY06HH8AcgTkzXH2WayssZvhXJnT8HieYztvPmaLstL/QwbKnMbZOYqVLLp7YZ2/6F6sWcIyM4MxV4LqczC8fGkctEEbR8Gmvvy+4wHX6R8lA39t39K+E/b9FHutUTpzR0eJIRWuW2V02/Jc+vfSEx7ch0g8fxOfrriIJCyrm/xgsIT3M/6HwDz1Rq8GZsm9sMbhvDAudNMLGywbAbCzuLx8dZt7O0+9D9qJwP0H0ytRcy46msc0/BLmy3Z6azDKlBeUp1peOlFPGC7sAYLPweU+hs2Vct/rJociNuFi6M2Rlup7S4fNluEFqC0ELqCjkusgHFlqhO8Mhj17qg7va96d5+VG5h2XgxwSGhR5JO5wc1c4NmsuH4xDSkSFmMROjZU8qfmAl3nG8XywzBOndtXwB9xMzlAajBRNHbTEg8cgviZtEIo90MMeCi/VJNIx+v1viApDXrQrw/fsXpmUhOM8UEhF+hGZMErwcBsC+BCmz3luSnSOqPPuosiEKi/CM6niEwCylFRtgjIbXa5aP4qJf/95iW6p3AGc1MESkMLZF2+PmB5+x8E1kyHTYNroPzaLA+GWMfu8dptQpqz3XcOdfiOh4ypHApNuyDU9rjjgkVBkYCGIjFm2ePunNw97Hr9CZkbQZm2/gdOuxCncUmDc96HNplJzJOiqN3eGd6FUUp5yWc8co+4kUwb4CQ7/Sv1U7dsNHZvEHabXTzS1473P1j73PpEGz/i+xpp3/FTFH8bOjC5KRy8aoYHRkbxskByaW2FRueCcobu6HLtakHhJ5azyJJ379ofyjsYCcWDIoeJqjrsGVFMkSpfmquQSuw0L97BX5N3dxqLi//dkA6XreP7a0Y5VTX4/A/wX2GfQLShfUw9thKW06hl2cU+QecZkR9r5TTFFJC9dPSs5eSbw4BW80MJf0yEltR2sMRFVo8sROAep/ASUvVmug8hiBdY9DK1PSOMDzJkgNk3plOhNb81P4H4y X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: be908c85-b9fb-40f2-ff09-08da376b637e 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:19.8985 (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 5/7] avcodec/mjpegenc: Remove pointless motion-estimation options 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: xWIb/Q+c5K6t (M)JPEG does not use motion estimation/motion vectors at all. These options therefore don't affect the output at all. So remove them. Signed-off-by: Andreas Rheinhardt --- libavcodec/ituh263enc.c | 2 ++ libavcodec/mpeg12enc.c | 2 ++ libavcodec/mpeg4videoenc.c | 1 + libavcodec/mpegvideo_enc.c | 1 + libavcodec/mpegvideoenc.h | 16 +++++++++------- libavcodec/version.h | 2 +- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index e99ebfe076..ca44819639 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -885,6 +885,7 @@ static const AVOption h263_options[] = { { "obmc", "use overlapped block motion compensation.", OFFSET(obmc), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "mb_info", "emit macroblock info for RFC 2190 packetization, the parameter value is the maximum payload size", OFFSET(mb_info), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, FF_MPV_COMMON_OPTS + FF_MPV_COMMON_MOTION_EST_OPTS #if FF_API_MPEGVIDEO_OPTS FF_MPV_DEPRECATED_MPEG_QUANT_OPT FF_MPV_DEPRECATED_A53_CC_OPT @@ -921,6 +922,7 @@ static const AVOption h263p_options[] = { { "obmc", "use overlapped block motion compensation.", OFFSET(obmc), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "structured_slices", "Write slice start position at every GOB header instead of just GOB number.", OFFSET(h263_slice_structured), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE}, FF_MPV_COMMON_OPTS + FF_MPV_COMMON_MOTION_EST_OPTS #if FF_API_MPEGVIDEO_OPTS FF_MPV_DEPRECATED_MPEG_QUANT_OPT FF_MPV_DEPRECATED_A53_CC_OPT diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index 8d867cd7d0..e4980240c5 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1172,6 +1172,7 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) static const AVOption mpeg1_options[] = { COMMON_OPTS FF_MPV_COMMON_OPTS + FF_MPV_COMMON_MOTION_EST_OPTS #if FF_API_MPEGVIDEO_OPTS FF_MPV_DEPRECATED_MPEG_QUANT_OPT FF_MPV_DEPRECATED_A53_CC_OPT @@ -1205,6 +1206,7 @@ static const AVOption mpeg2_options[] = { { LEVEL("low", 10) }, #undef LEVEL FF_MPV_COMMON_OPTS + FF_MPV_COMMON_MOTION_EST_OPTS #if FF_API_MPEGVIDEO_OPTS { "mpeg_quant", "Deprecated, does nothing", FF_MPV_OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.i64 = 1 }, 0, 1, VE | AV_OPT_FLAG_DEPRECATED }, diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 69770dc153..45bba455bf 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1379,6 +1379,7 @@ static const AVOption options[] = { OFFSET(mpeg_quant), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 1, VE }, FF_MPV_COMMON_BFRAME_OPTS FF_MPV_COMMON_OPTS + FF_MPV_COMMON_MOTION_EST_OPTS #if FF_API_MPEGVIDEO_OPTS FF_MPV_DEPRECATED_A53_CC_OPT FF_MPV_DEPRECATED_MATRIX_OPT diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index c9d8c48026..1ef3e6f4a2 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -94,6 +94,7 @@ static uint8_t default_fcode_tab[MAX_MV * 2 + 1]; static const AVOption mpv_generic_options[] = { FF_MPV_COMMON_OPTS + FF_MPV_COMMON_MOTION_EST_OPTS #if FF_API_MPEGVIDEO_OPTS FF_MPV_DEPRECATED_MPEG_QUANT_OPT FF_MPV_DEPRECATED_A53_CC_OPT diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index ecc389a6d3..a5f1014b50 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -92,10 +92,6 @@ FF_MPV_OPT_CMP_FUNC, \ {"border_mask", "increase the quantizer for macroblocks close to borders", FF_MPV_OFFSET(border_masking), AV_OPT_TYPE_FLOAT, {.dbl = 0 }, -FLT_MAX, FLT_MAX, FF_MPV_OPT_FLAGS}, \ {"lmin", "minimum Lagrange factor (VBR)", FF_MPV_OFFSET(lmin), AV_OPT_TYPE_INT, {.i64 = 2*FF_QP2LAMBDA }, 0, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"lmax", "maximum Lagrange factor (VBR)", FF_MPV_OFFSET(lmax), AV_OPT_TYPE_INT, {.i64 = 31*FF_QP2LAMBDA }, 0, INT_MAX, FF_MPV_OPT_FLAGS }, \ -{"motion_est", "motion estimation algorithm", FF_MPV_OFFSET(motion_est), AV_OPT_TYPE_INT, {.i64 = FF_ME_EPZS }, FF_ME_ZERO, FF_ME_XONE, FF_MPV_OPT_FLAGS, "motion_est" }, \ -{ "zero", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ZERO }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ -{ "epzs", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_EPZS }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ -{ "xone", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_XONE }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ {"skip_threshold", "Frame skip threshold", FF_MPV_OFFSET(frame_skip_threshold), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"skip_factor", "Frame skip factor", FF_MPV_OFFSET(frame_skip_factor), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"skip_exp", "Frame skip exponent", FF_MPV_OFFSET(frame_skip_exp), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ @@ -103,15 +99,21 @@ FF_MPV_OPT_CMP_FUNC, \ {"sc_threshold", "Scene change threshold", FF_MPV_OFFSET(scenechange_threshold), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"noise_reduction", "Noise reduction", FF_MPV_OFFSET(noise_reduction), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"ps", "RTP payload size in bytes", FF_MPV_OFFSET(rtp_payload_size), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ -{"mepc", "Motion estimation bitrate penalty compensation (1.0 = 256)", FF_MPV_OFFSET(me_penalty_compensation), AV_OPT_TYPE_INT, {.i64 = 256 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ -{"mepre", "pre motion estimation", FF_MPV_OFFSET(me_pre), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ -{"intra_penalty", "Penalty for intra blocks in block decision", FF_MPV_OFFSET(intra_penalty), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX/2, FF_MPV_OPT_FLAGS }, \ #define FF_MPV_COMMON_BFRAME_OPTS \ {"b_strategy", "Strategy to choose between I/P/B-frames", FF_MPV_OFFSET(b_frame_strategy), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 2, FF_MPV_OPT_FLAGS }, \ {"b_sensitivity", "Adjust sensitivity of b_frame_strategy 1", FF_MPV_OFFSET(b_sensitivity), AV_OPT_TYPE_INT, {.i64 = 40 }, 1, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"brd_scale", "Downscale frames for dynamic B-frame decision", FF_MPV_OFFSET(brd_scale), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 3, FF_MPV_OPT_FLAGS }, +#define FF_MPV_COMMON_MOTION_EST_OPTS \ +{"motion_est", "motion estimation algorithm", FF_MPV_OFFSET(motion_est), AV_OPT_TYPE_INT, {.i64 = FF_ME_EPZS }, FF_ME_ZERO, FF_ME_XONE, FF_MPV_OPT_FLAGS, "motion_est" }, \ +{ "zero", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_ZERO }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ +{ "epzs", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_EPZS }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ +{ "xone", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = FF_ME_XONE }, 0, 0, FF_MPV_OPT_FLAGS, "motion_est" }, \ +{"mepc", "Motion estimation bitrate penalty compensation (1.0 = 256)", FF_MPV_OFFSET(me_penalty_compensation), AV_OPT_TYPE_INT, {.i64 = 256 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ +{"mepre", "pre motion estimation", FF_MPV_OFFSET(me_pre), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ +{"intra_penalty", "Penalty for intra blocks in block decision", FF_MPV_OFFSET(intra_penalty), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX/2, FF_MPV_OPT_FLAGS }, \ + #if FF_API_MPEGVIDEO_OPTS #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 }, diff --git a/libavcodec/version.h b/libavcodec/version.h index 5183deb68b..aeb58e3fed 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 29 +#define LIBAVCODEC_VERSION_MINOR 30 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ From patchwork Mon May 16 18:38:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35797 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1674687pzb; Mon, 16 May 2022 11:39:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytbRIvoReA97dloRrnil1izbR1HTbEJdhhMvvctLaL0mIMPRHiEeuDi+nsF+nVRxWKJDom X-Received: by 2002:a17:906:9b86:b0:6f8:24e7:af7d with SMTP id dd6-20020a1709069b8600b006f824e7af7dmr16837390ejc.295.1652726396444; Mon, 16 May 2022 11:39:56 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g22-20020a056402321600b00428b437b779si10801118eda.557.2022.05.16.11.39.55; Mon, 16 May 2022 11:39:56 -0700 (PDT) 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=EgoqJ4Cq; 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 9970A68B43B; Mon, 16 May 2022 21:39:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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 65BD268B3F9 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=arWu4MnU5YwEU0iJxW5YT/kS9D/uios+R7UJS+IaNRTg7II/S2DzSeJSNqlUoXY888VlClqk5WgCwm4z9yGKFKsSZys3ippBaW5K22zYXGLPy/upAJghutMyzaqoi+NznqiiTlYq0wTqmZY4LYyQazIrwGx5ZyLxeBqbgNIgolEGqeknhcvYG7AQ9ct1xLlNUsllIO8yPV4aox/a2fkiZHDIwv6E/xKzs5vPQZp4R48x7VJfeHUP2548wZQRTPjr0PDBjqwqrGImKX3J9hvfpgPL8QkcJEg8WANPmFrLn7NKG8oC+G/YLQlgSsYQ2+nx+c0aJmKX9uBBZydx0Q0cNQ== 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=Hzp29NqU3xTA2eHXV1UEPRK6zcRMMvajS39YNCYUDy0=; b=BLGTsqMiVPqYYz/LnTvgTImSS+Yvs/bUnaYQYaq0S6G9QXT8NOllEydvt0BB3teYjNDu4uSQCeD2PLd3udW0c8uSALqzoFph1E67LBVphBvKMjgKnTdyNXwUinl729YkQ4XgWj/TTXdYZ8PluA7u60BfZKhcotrRh4yD3r7VbgmxPItAltWlHnzEzJctKb6VVFrdMykElsHj0PFP/HsTWg481QEAt+I5bFuYRSrjD6V0Mqwu42g1+knwZaRLlH2lUF0IUfTNV1qNYc3jd1/zmk8oqEdyCFNsaaiJ7Hq9uadrXq0365/iTiWWhIBQFM/M+w9meEnXdV/9hR/cL8XAiA== 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=Hzp29NqU3xTA2eHXV1UEPRK6zcRMMvajS39YNCYUDy0=; b=EgoqJ4CqOAsTTpo50qkrjeyvSeGRiYwccVJ3jvU3wtAP1KrG7rgeiGP2sCUnwlk/O34yARXTAZqvbakUv41lvP493QSARXWwtcaajQBEtcAUmaKp6cWw/EIHJ/QftaIOC8aZIs/2+QsIi2NrV4YZH0hmfitCg6MfagddCq/WIcT6wO2MXYB0SZ0Oq4Oa7K1GONPPnD7WpXUzVwJEjc7XUO5wp/ZATx0JM/fCPsM8pkjVSk8yyCQBg6P0MqgAi9uyiy1A4rIKVaE82E1XLcaaEyqrD2hjyKVqSCFJA2ampCcrwh2JBmt5WInAd7qSOBh2J0tk6dqc0svC17x4Tg5ksw== 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:22 +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:22 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 16 May 2022 20:38:59 +0200 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [jH3PxDjKaMMFk0nc4DCu6+rmdDYz713i] 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-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5618d9ab-aa2f-4008-88d6-08da376b64b2 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNW7ZO6S4gJQgGfxIlJxJzTeHdRNli+6UwGfPO8jVJ/6svQ/jjeoLEG1d+AcefFC29iVc6uaFqDCCrIFWASvuNJiKvdipNBL/T0TAn+Wgdl4oE0Vjvl6epQ9140abcd5FwISWLcwhGrWdT+pkSV0txQyGt+r6xuVloS/dBK5ssL8b8MVBvfhk9XVvVjtLvR6DmIft+5JjuAFRyFqJ7S36z84kYPSKj//JLIccrcvJ2tMO/Zl6/Yj05g3coz9W/1RdEw/3cBiK+pU52DiV5R8RYHx4Lum+LvrjjzsQ6aa4cLxFelMMzOlelCY7mwgjXZc1ozwjO/FEH/qi2DHtSz4PHy6WlJ75mMCzvKH8G04yMBy9+YnspSeqgxj0ufV5WlROtvpYEmiqplig/M7Haicqn+ZEWA81HUoAT2BAZppDoRqcTIB1g32D/HDncqb/n4vmr/ltHbJmfhX1nxrnd4L/AFxa/6q99ufLPZZcrv2JfQBK7/H3j8LEfcBZt/jwGnR327g12548OTPDb4V6B0h4wj790sd5foDBJY71bGxKQ5S7yvP/bt45O6OBSZPOfM+RvpQajB+N5iA3BrDg9rjhUA7pifHQbEUbmkPNZkGcZfEn5N+Csx6DMACHBfZSA6HMWqBScSWBZZtfP+X4eS0/xOzFTyZGXfPyOItppx3ija5ylLgEdsYk+o3XiNscZHVqi3bQcy+12MDKFcJ2Yri+RtL09r8pwLQgsI= X-MS-TrafficTypeDiagnostic: VI1PR0101MB2414:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8YBccmgrwYLIqOnIhSINc5wtFzEScj9XvXDdWGKys+yymLHlgqmeMT6yw0oOI/tY1PE06QuLezMJrpnsivWf7CiRs5ZZImUO64eagxHcSEwqrQFTgFFQyNBjdIDJU4As8XY2E0Vch2xv20MIfp9D+OXJnuJyH0+qDNqPjh8+IIT4EE5NMkjZUxnyC2qvr1hJpYJPnDXPRHk0fwuGGmqLGLV4rprLfBD+PbtSp0DgHHnczCiUEu4/SGqoFmeQakUkWOVBOAnBgpN7VrW++jdJu/Vcg40ZlJJqdoEWRckuaKVyjABfTgkE9aKIjyo00Zyn8f9EJa7jFPlJhOBchasuQfj0U51unQZvNnhDfbB6EV6QlAXgZujNI2MRY0tJ/BbXomwEJ7V/xd0wj1D0rgPayDNG/weIGN7SW6cydq0jz/asAZeVdSGnhL2NX1NQ5omqh43DUk8q7XQ3Hbgd2aX2AIlGcTlE1y8BtY7H3R80kMYUSNbMQ8HtuSi7PokCq0NFVPdw8bWKrArVCh2Qt6JyddvNQ9byFYXXTLJp6qtmC/brDmlenL1h1lW8spVzBuGBpWJVZewezNL88LYi1/GD2g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Ny+9kFVlLsyVBVwytQhBdxH7ZyXrzRQnoUictiik6djn8QdO8NBfTl6vJYH9wqRpr02wqi2g+jcDY+WgiPe1ztHJT4dXJi+uN2Ba+r/GWUxEStYI5OKgRwBzmbgZmkgHhqfXCz5QknHsF6kLVv6V2KaVGcvq07pI17utuPOncOJpY/7b3zYdxsgzRSVy5VM1qKQTSBn16RtvBePyyIENGvY3sgBhwrQpo2AORRYreuWQ6GPMMEOx9ZyU9t0m56NSyeJ/2yd/Dori3zxcJuf0QmpnNbr9/JQI9dtm2Bc6KytJyu+wD30jF3lILAL60lvq65EsQKA7IIqtTwnL2VCXC+A9ouxQe7dn67DpAwy6jBae6quVijk1mxSwbbMq/dawbNwQyHwl92JEo+8c2LfBBFtmuNDfrPtX20UWbgw+GcYucXgAYKiOGIR/ZKBBRohaW3Y22xtny5Q/ysWk7CSs87qn3UoyBe9994yom3aUUenl5tWKwemq3wRvRNNOqo9xbPyUqW8s9yygPpo4YhxPrTRufR0Ei+bOhVekKf/hUsT+umSGpkZgmKChPlDodoeySijga3Ga4lCxH4g0UA/GT4pCHAuSxv7ct4Rfv9egkBR0Jzp9EJpKYc48SdaFaU19W+lwdzOqpIGTGuCwKmYL0KoZPS1mqOzo2vsb3E8esGvEod6G7EjNsl1EtlQqhtpVfT7hq3LXlzyFBBRfj5QbIb9Q6zL7HvX/r/Mw5pvALEjkaxxyR5oXlsAp0BIRa8I1+jCeThWuqxGuc7wdEwNKlnhKM2602sbKv747t1/5UXjYnjig9HEkRr5nkEC2wiLWrBeHdkDcuVOKEsgiVPHPOoLCeL5cq+0EUPXPnJRvnK3KVxU/NRuukELW3KWSjggEkWJqRQ+VilCBlxFSCyvTAVW++/r2IQbjAgDd3oKM/ej0KFZHvb3hHepBU+ujj6eQ7MqID+n/15aw0H3d/5BJQnvCcE3IdD1gENQDUtZJH8iNf0GExY7FkyMDvz9F9B/5zr16gA54FUiqKRZXHn+0H/DY2A/9zuxHLmD0kAra5WGrfy9JIG+Zn42E70XrJIl5q2l2mnObpsFYmph3PkSvzA7CCliae1+YCbqgFDCcQWDC8zmxXTEni6+QLaeefIArK9HtaVrvnLRLXIzhJcSwk0I0gX0MFylveinLkji3OpK1ZALlXFPZ7r7B/PLd74WTFPGR8ms79GFH4SKW55RF92baouBHWIPzfbbAk6nWC7rXqO4M9zYjwifLFC5kBbywYXpZZNnPJMO93A0FfCkDpAewR27dvsmfOV2wHx0VCgTSdfcr60qRJVJ7CgkgbiEfhyJ+h+7U7rzXvPikCXGfkRMbyuHGkRh2OeQZ/ugyGsg4Fz6WFr+nwsZXtrJB4qz/w0ZLvBzpdvUQLNawmewIa6y0JPQTqBC5tEnMGLZQVTfx6qclOJf9/GL1q65r1ixI X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5618d9ab-aa2f-4008-88d6-08da376b64b2 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:21.9921 (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 6/7] avcodec/mpegvideoenc: Remove ineffective options 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: rciwCDh+6ivI This commit removes the ineffective FF_MPV_DEPRECATED_ options, namely mpeg_quant (this is only an option for MPEG-4), a53cc (this is only an option for MPEG-2), force_duplicated_matrix (applies only to MJPEG) and b_strategy, b_sensitivity and brd_scale (these options only make sense for encoders supporting B-frames, which currently means the MPEG-1/2 and MPEG-4 encoders). Given that these options never changed the outcome of encoding, they are removed at once. Notice that the options for the encoders for which it made sense are not affected by this. Signed-off-by: Andreas Rheinhardt --- libavcodec/ituh263enc.c | 12 ------------ libavcodec/mjpegenc.c | 5 ----- libavcodec/mpeg12enc.c | 11 +---------- libavcodec/mpeg4videoenc.c | 4 ---- libavcodec/mpegvideo.h | 2 +- libavcodec/mpegvideo_enc.c | 6 ------ libavcodec/mpegvideoenc.h | 13 ------------- libavcodec/version.h | 2 +- libavcodec/version_major.h | 1 - 9 files changed, 3 insertions(+), 53 deletions(-) diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c index ca44819639..2fcd001dba 100644 --- a/libavcodec/ituh263enc.c +++ b/libavcodec/ituh263enc.c @@ -886,12 +886,6 @@ static const AVOption h263_options[] = { { "mb_info", "emit macroblock info for RFC 2190 packetization, the parameter value is the maximum payload size", OFFSET(mb_info), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, FF_MPV_COMMON_OPTS FF_MPV_COMMON_MOTION_EST_OPTS -#if FF_API_MPEGVIDEO_OPTS - FF_MPV_DEPRECATED_MPEG_QUANT_OPT - FF_MPV_DEPRECATED_A53_CC_OPT - FF_MPV_DEPRECATED_MATRIX_OPT - FF_MPV_DEPRECATED_BFRAME_OPTS -#endif { NULL }, }; @@ -923,12 +917,6 @@ static const AVOption h263p_options[] = { { "structured_slices", "Write slice start position at every GOB header instead of just GOB number.", OFFSET(h263_slice_structured), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE}, FF_MPV_COMMON_OPTS FF_MPV_COMMON_MOTION_EST_OPTS -#if FF_API_MPEGVIDEO_OPTS - FF_MPV_DEPRECATED_MPEG_QUANT_OPT - FF_MPV_DEPRECATED_A53_CC_OPT - FF_MPV_DEPRECATED_MATRIX_OPT - FF_MPV_DEPRECATED_BFRAME_OPTS -#endif { NULL }, }; static const AVClass h263p_class = { diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index 8cada8366c..0ba166da5d 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -637,11 +637,6 @@ FF_MPV_COMMON_OPTS { "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" }, { "force_duplicated_matrix", "Always write luma and chroma matrix for mjpeg, useful for rtp streaming.", OFFSET(force_duplicated_matrix), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, VE }, -#if FF_API_MPEGVIDEO_OPTS -FF_MPV_DEPRECATED_MPEG_QUANT_OPT -FF_MPV_DEPRECATED_A53_CC_OPT -FF_MPV_DEPRECATED_BFRAME_OPTS -#endif { NULL}, }; diff --git a/libavcodec/mpeg12enc.c b/libavcodec/mpeg12enc.c index e4980240c5..09d63ff7dc 100644 --- a/libavcodec/mpeg12enc.c +++ b/libavcodec/mpeg12enc.c @@ -1142,6 +1142,7 @@ av_cold void ff_mpeg1_encode_init(MpegEncContext *s) } else { s->min_qcoeff = -2047; s->max_qcoeff = 2047; + s->mpeg_quant = 1; } if (s->intra_vlc_format) { s->intra_ac_vlc_length = @@ -1173,11 +1174,6 @@ static const AVOption mpeg1_options[] = { COMMON_OPTS FF_MPV_COMMON_OPTS FF_MPV_COMMON_MOTION_EST_OPTS -#if FF_API_MPEGVIDEO_OPTS - FF_MPV_DEPRECATED_MPEG_QUANT_OPT - FF_MPV_DEPRECATED_A53_CC_OPT - FF_MPV_DEPRECATED_MATRIX_OPT -#endif { NULL }, }; @@ -1207,11 +1203,6 @@ static const AVOption mpeg2_options[] = { #undef LEVEL FF_MPV_COMMON_OPTS FF_MPV_COMMON_MOTION_EST_OPTS -#if FF_API_MPEGVIDEO_OPTS - { "mpeg_quant", "Deprecated, does nothing", FF_MPV_OFFSET(mpeg_quant), - AV_OPT_TYPE_INT, {.i64 = 1 }, 0, 1, VE | AV_OPT_FLAG_DEPRECATED }, - FF_MPV_DEPRECATED_MATRIX_OPT -#endif FF_MPEG2_PROFILE_OPTS { NULL }, }; diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c index 45bba455bf..8f0452de3a 100644 --- a/libavcodec/mpeg4videoenc.c +++ b/libavcodec/mpeg4videoenc.c @@ -1380,10 +1380,6 @@ static const AVOption options[] = { FF_MPV_COMMON_BFRAME_OPTS FF_MPV_COMMON_OPTS FF_MPV_COMMON_MOTION_EST_OPTS -#if FF_API_MPEGVIDEO_OPTS - FF_MPV_DEPRECATED_A53_CC_OPT - FF_MPV_DEPRECATED_MATRIX_OPT -#endif FF_MPEG4_PROFILE_OPTS { NULL }, }; diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index a832369f7f..4b07c5bfb2 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -537,7 +537,7 @@ typedef struct MpegEncContext { int intra_penalty; -#if FF_API_MPEGVIDEO_OPTS || FF_API_MJPEG_PRED +#if FF_API_MJPEG_PRED int dummy; ///< used as target for deprecated options #endif } MpegEncContext; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 1ef3e6f4a2..459bb3989f 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -95,12 +95,6 @@ static uint8_t default_fcode_tab[MAX_MV * 2 + 1]; static const AVOption mpv_generic_options[] = { FF_MPV_COMMON_OPTS FF_MPV_COMMON_MOTION_EST_OPTS -#if FF_API_MPEGVIDEO_OPTS - FF_MPV_DEPRECATED_MPEG_QUANT_OPT - FF_MPV_DEPRECATED_A53_CC_OPT - FF_MPV_DEPRECATED_MATRIX_OPT - FF_MPV_DEPRECATED_BFRAME_OPTS -#endif { NULL }, }; diff --git a/libavcodec/mpegvideoenc.h b/libavcodec/mpegvideoenc.h index a5f1014b50..0e93124cc2 100644 --- a/libavcodec/mpegvideoenc.h +++ b/libavcodec/mpegvideoenc.h @@ -114,19 +114,6 @@ FF_MPV_OPT_CMP_FUNC, \ {"mepre", "pre motion estimation", FF_MPV_OFFSET(me_pre), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, FF_MPV_OPT_FLAGS }, \ {"intra_penalty", "Penalty for intra blocks in block decision", FF_MPV_OFFSET(intra_penalty), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, INT_MAX/2, FF_MPV_OPT_FLAGS }, \ -#if FF_API_MPEGVIDEO_OPTS -#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 }, -#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 }, -#define FF_MPV_DEPRECATED_BFRAME_OPTS \ - { "b_strategy", "Deprecated, does nothing", FF_MPV_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_OFFSET(b_sensitivity), AV_OPT_TYPE_INT, { .i64 = 40 }, 1, INT_MAX, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, \ - { "brd_scale", "Deprecated, does nothing", FF_MPV_OFFSET(brd_scale), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 3, FF_MPV_OPT_FLAGS | AV_OPT_FLAG_DEPRECATED }, -#endif - extern const AVClass ff_mpv_enc_class; int ff_mpv_encode_init(AVCodecContext *avctx); diff --git a/libavcodec/version.h b/libavcodec/version.h index aeb58e3fed..497389d3f3 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 30 +#define LIBAVCODEC_VERSION_MINOR 31 #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 6ece4ac518..87609d5436 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -46,7 +46,6 @@ #define FF_API_AUTO_THREADS (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 60) #define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 60) -#define FF_API_MPEGVIDEO_OPTS (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) From patchwork Mon May 16 18:39:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 35798 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp1674750pzb; Mon, 16 May 2022 11:40:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyzs7jGiDnLhBi3MLqrQftAlYQel2G/a3gzjDT7w5CTUgQqxRdpRQVN74cTBc2ye90/XdMb X-Received: by 2002:a50:9b08:0:b0:42a:2d15:e15a with SMTP id o8-20020a509b08000000b0042a2d15e15amr14482080edi.361.1652726406038; Mon, 16 May 2022 11:40:06 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id du2-20020a17090772c200b006e7fe0f67d6si86302ejc.586.2022.05.16.11.40.05; Mon, 16 May 2022 11:40:06 -0700 (PDT) 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=BJsOn3wn; 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 6528668B47B; Mon, 16 May 2022 21:39:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org 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: WtYL+sT8mnSNtS/6Reuyk5gCqRfpemRptiMpWT7Xpd0J1oFo5dh+f3Djzt/azbwlHToccTCxooWL0bB+q/bRzWFq/47znqebdqXt9Sre95JK6q0pBanBhxi1V3HdnRJRU47NrdJbTVPAVz/Oxb2+OpyGsZ1qJtLWqprjmJWSyDAtiioFyCKfK6K9RUUGlMx77n9IIO3gl0ksKhlhyx309UcqQgc1rfHBl+gl0y/su5vLbrXOsaEqKH4HSXJcfggBZeOePhmZh7R+pBGzYq88kntncYax546JXE54wxHySLdr90mQKuHSXz9wUvwxQ5+kMQkPoi27VJdmbNsB4W+TYNMmx29zEfReMD+iqQ4lJYxk7kAZrsMqwE92/LGw3stoMs0AswoHA2j80QXUUXck10AKOdpw5y+G+fHevtk/ssvXmU+mrza6TDv0Yt20e/be8DY0kyX1Hj/KgOAeB3PJZTDiDl1V0qbig/iYuMCPX9LnHDPf0xuEaByNquA1kVyyZCB0FqJzXGUfBV/kdP7EfnpLSZsesmDIYkVhI4G4XAMGqdUcRIB+pd3ti+IIYXZrCfOXwvxLWeTgOVlGNId/mK6/fkggTwZN2bKkEEabhRhPwOar2ofQqVeFO+IA54GRWWtUcJx3OleMvo7sy78nX2M7Kp8jb+3Oiq5xBLoyx1tAlFS+1B9Iy1B1VQ6GMPEABWjeoKclYF5wT9kMAsuN7FUsBXLmgXpzMM481PHiOC/UOd1402r9KWSKC9bv9njFSpQzbnAhnZF7tWLZLTu9xKkjloh3SQzp/1k14kpHB3bdiU2JC99COC2wmRSdroGV1s3RFX3LJ+mJCEMsTduo1jjZHX+/sDDTvyoUgIuqXbBwJ0GtYD6EczYcLPkJCgafBcbC+C+9k7yD/ESg5mfCXlevcQxpIWi8hCbmkg3viMrpComqK9pEBU4r9vdZMHWVKjZz3MY/Itz1E9NaC4kfBFAFUnneivRhhCX1rjJWMCPv0JRACEDaMIyHTH1G0T6ciP1d2T3ordOSjIc+AGoypk9Kes7dGrLijtKlR2suptQQMPwaDd1LPvEyfeCb4BdTcn1A6JbsxBwEl+PNwv7OcIu9hOeWNiZjaZzEYVib666YY1K/LI/imzrDQkxNRQdjq6PWVrUEO4PI3Mlqlb0towcOwmwtS0dg02q7beWB64xO1HrxZ78WnUs7pHr/V9729DHaWbiGtdtMBul+7cARkgK+2qBrR3kqe6xvdssLqDZt6UrLxk91mWxPbTav8tZ8Yit3hAzCI4nk82EWN+1YQgOOqXZIpf3VV03fZY3CmbWDrEvQcKc3bzInPCcZ0iMr36U7uiIotRSjiRmRx/GxpHQmSYad82MpGCPf7FoX7qC0NK/DJnBzHYLiR7ojUM3dVQafRVxUiPDzonwix5V2geeJTocnGJi2Au2hMEIlwEA4BBV0OEu4X7G4Fc8AStEk 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: raB3IkjZ4RpM 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)