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 5BEA64AB2A for ; Wed, 12 Jun 2024 13:53:29 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CB63568D9BA; Wed, 12 Jun 2024 16:52:37 +0300 (EEST) Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2047.outbound.protection.outlook.com [40.92.50.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6071B68D982 for ; Wed, 12 Jun 2024 16:52:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AK12RNxaKdfKV1oNjOkh6bKw0/biZHNHnsqLQ2oSiPP+4svsuHW25T53Sl2xMs+0IBEtTzR7tzjkjV+xaQKTdCaB4EvyrurlCOagzpoAv1N6qwtoWvt8o8bv87ldUZUjO/9lOw74PpDbq3Fxo84hmmntug0O73LOMAnhPxOli0pBFcoCRn3+PX1rAd0XX1j76d/pJ7w0Awyx9QVLfUd/QXRJT6qO9BUqQ3OQecNe8BQNgM4GF1/O3FxYWPSqNaMcz/T/e4dOz4TPSPVNpIx7GWQmcB1arIOOpET5XUI4noNYyKFhYPBgVHi1ZLQLInjp9WRZXNABj99FYZjL4r6NGA== 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=sUCB22u3woQNVNS212kCvxAiiThT4kYfSEaGXiE1ABs=; b=ePPMZFfESxBZjg44Xr9WYfK3wQEkiDnrfi8GUl2kVr0xnezzXYAFD03YgKNQI5xaJI7Ay3vYr/T3Gh0XBpFNJdiqno3i2Xaf02lUX0MaqPjl0JbbZzEuHdhW+yEG7JUt28vBB9eF1bLChF/9NYOrWLHVSbVZ9imRp0IH9f6yyfJ/iZ1tIN3MbT/Sm8AljLHNmUI+GFcXlyx1rEFS52lTHJhImjCpKITsxQ2ST1JgI6FnuiGkjURuDGgevdWXx3fBZxibZTnRYZCeMphuOhjxxuONYOZJF4u1DRXDrIDbu15iaQxaPsFqusD6Yc7Enj42Sip6egcpij2Q8/Tv5TW++Q== 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=sUCB22u3woQNVNS212kCvxAiiThT4kYfSEaGXiE1ABs=; b=WXnpjp5vLSKe84ai3/JUYF3rdB8aNp0Vaat6IN7X1w3TLaXzomjPXyOp2RBgvMEmll53qyrFHbvM1mheQrTwa6235849DocewwY9jjH0FzHsMZ972tabI4izpg2zFlL2jNpsK+lG+2l/BwsWMv6f3dZwzy1fBMDgcRNJqRhW6lr2cle7cuBqrEcefEb5ToebL+jKbgckTG4Xx+LzE5XITFr/f7d/3fYguBZhsJf3sKWgnBjfL+jcwcG2/wLna/ahZ+n9Uha4eLRACdmVP2OmtePia4Txholmsf4fQa5ED2fLsU41TnWiDirt2zGdx7qmIQp/BN4OYACj6GAci7gy9g== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0054.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:359::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7633.37; Wed, 12 Jun 2024 13:52:34 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7633.036; Wed, 12 Jun 2024 13:52:34 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 15:48:21 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [7GV6ajdkoszlaH69VmiU8/ZI00yl501fHTywArrj4EA=] X-ClientProxiedBy: ZR0P278CA0189.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::6) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240612134853.2102377-24-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0054:EE_ X-MS-Office365-Filtering-Correlation-Id: 438560d1-c6d7-457d-1a64-08dc8ae6e926 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199020|440099020|3412199017|1710799020; X-Microsoft-Antispam-Message-Info: 04zruAl3rryKsPqBBEJtW+6kMJ3WnLoeIsJthYr9kkNNTqj4KYscEAbEeOwjPd6i/qGQGg9g+OZ6oE1sLKzKyTlrLNJqg2MuYSiDOg8y2/2q8hoQKQEcGQ2rwPShg7eDoki7V43MQRciURZZEgwx5OqpQFmsJTOw08CfBuYtEjBVywQGmq1hT6P16Rb4g41lTDi/dyjBmHlsHjrHYiT8DdzmDSTVTvbduGV25vNwmuXeNT//WiN1vOugm73A6TQpqVx3wqAHpW/3JMfVzcSlO+Myf6xoulK51QE2K+NWRww5fQ6mUDk4d4q8TzlOHoIBJNjhOgjCOBMcsdymz0NscFoG26Z5hixIxyIUN4/Fk0F/u/26nvX346CGL63qns9mJd55pFJBIROTIcjPnvAHTEvXlVU11qPFowD9am3bBbQD05ZG5TvzZ5jtKDqPN6ZC7CqgM4v6bvaR1B5FWCaxASrDAT0RKYw3wqskUoDKBa4cwwc9gL1xgXp1x+ymk9JMxNzCWdHAEDGGCyYBrE9q46bWZijDcggGUqgydh9cWXPq7emI1z0iJvXRNaHlRSKXSJ5XsbFjtmPONNTSMU9BKatTSMqxPu2Gnh73gH5LAlAgxXJRwr4T+y5kPi9PCXcC X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DWrIId+SU8V1Z/p00GKVUXtnqmrJMSHLSYnYOOGW9N10QMn2snVjkNFKxR2o?= =?us-ascii?Q?dE6c5FM0TTIZaAp8ERaKwgl8RjWIRxQCYCcH4R1CVMz51tLbfKksnkBDt9+o?= =?us-ascii?Q?FXitRisbrvNnb3gEhhmXaUFTIZxhcxdhH+WZA2FkIauerKPf9G00hjWvZIGM?= =?us-ascii?Q?dFec6eqd1tS4j/loc8Vg3YkWL4+9HKzLeQjlZwU4IXSdaktvhn35oHzWWPCZ?= =?us-ascii?Q?U6TKcmlioFzaBLnPCa6M3ezSGDXzMfe9e4ad56lFu8t0TUTm6Ez6S6HRn+1v?= =?us-ascii?Q?TPaqZ9OrSMVnwHSM+bUCObfLnVrfy8glYtark4kk/IxnQ7RUYOmxJcW6sFDh?= =?us-ascii?Q?6zC/wQEWNXZdRccOg8gHj47AeFzDYpNpLKaaxwjnqoEz9tnT7SxOy2Oo8gi9?= =?us-ascii?Q?ARSASt2pbWEnDr594Ukrln+aLsPRKBFtoWORexi2pzbCR9aQFERp4PAVVzcd?= =?us-ascii?Q?SZ4PhRVcBo+eR04y3cC4IH81vnrPHbu5ABCYEngkWl7HFGm0TsEwIR2Q67Sg?= =?us-ascii?Q?xAhMkvb28fW8uJb8T7/IHnU3iLSkh2ozmFm8cZ+d1dm2eZbHxkuODnPZ1ApJ?= =?us-ascii?Q?hRvI/Vt5ZylBWkjhIoyI1J69KyT5V4fYBDV7ZuIEuqeW4nfVpQ0mHtzU+D2l?= =?us-ascii?Q?3GkEKLnhi4cL5LLMM+xDNUbfNbj6RqJByPaJ+jkalJ1TV3bzI0m+jwRHtLOq?= =?us-ascii?Q?IFmImQzuyzX5BLApzLh1IiM/EIeo9HuZnHswrhiQkrN3alcNeNcRdL/ebbSI?= =?us-ascii?Q?kFy/9ZuRMISRAhqjAjF8CIjp7F9Z7P8M+98B7gqV/733edtMmkWsnmr+g7x0?= =?us-ascii?Q?XhUQsmcVko+/v/3XoQ9n5bXRxGzF1AnSi69Tt/PO/hUxk8VLnyCrMZVEubsd?= =?us-ascii?Q?2RhUYzdiHM+d3WuubWBVegxiQbfn+GtVHrLRnisGIMNEZvVHbA1cZByJzHCE?= =?us-ascii?Q?WIu8J3sOGc0uex1qUYin2TLb6WrZ01+zz5+4wzzeivlDvNtvYeWwSjJgLWEn?= =?us-ascii?Q?muYYXv6Z/B9B8ARETcCgTaf5UBM6rGUNXBEETV4JOTU5gJ78ep9RVz3tHG1Y?= =?us-ascii?Q?ABIkhTFuphqdMvjZoA5dX2cnxiYrMKoIiTOFblOd9AwXr6u0X2zW8dWtG5dZ?= =?us-ascii?Q?goKq+EEJ8pSkoYR8FP2dgBL8oPmpTz33EnO8TqiCYggNSKKg49Fg97xlDyBu?= =?us-ascii?Q?A6UfQFvO+H0yUkHA+Tn/HkqlYtMFR6YLLtHrXakL7OU9siQbv1LWfabA6aV4?= =?us-ascii?Q?IIZ9/RGSAJsyPJlrnS0IOQ1c8ulWQZrolgQPXydP6A=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 438560d1-c6d7-457d-1a64-08dc8ae6e926 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2024 13:52:34.0438 (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: AS8P250MB0054 Subject: [FFmpeg-devel] [PATCH 25/57] avcodec/me_cmp, motion_est: Sanitize permissible cmp_funcs 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: Several of the potential choices of comparison functions need an initialized MpegEncContext (initialized for encoding, not only ff_mpv_common_init()) or they crash when called. Modify ff_set_cmp() to check for this. Signed-off-by: Andreas Rheinhardt --- libavcodec/dvenc.c | 2 +- libavcodec/me_cmp.c | 116 +++++++++++++++++-------------------- libavcodec/me_cmp.h | 9 ++- libavcodec/motion_est.c | 11 ++-- libavcodec/motion_est.h | 2 +- libavcodec/mpegvideo_enc.c | 6 +- libavcodec/snowenc.c | 2 +- libavcodec/svq1enc.c | 2 +- 8 files changed, 73 insertions(+), 77 deletions(-) diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index 784340744e..f2221d0b94 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -100,7 +100,7 @@ static av_cold int dvvideo_encode_init(AVCodecContext *avctx) memset(&mecc,0, sizeof(mecc)); ff_me_cmp_init(&mecc, avctx); - ret = ff_set_cmp(&mecc, ildct_cmp, avctx->ildct_cmp); + ret = ff_set_cmp(&mecc, ildct_cmp, avctx->ildct_cmp, 0); if (ret < 0) return ret; if (!ildct_cmp[5]) diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c index cff8936e44..dfc351d7ae 100644 --- a/libavcodec/me_cmp.c +++ b/libavcodec/me_cmp.c @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include + #include "libavutil/attributes.h" #include "libavutil/internal.h" #include "libavutil/mem_internal.h" @@ -473,74 +475,60 @@ static int zero_cmp(MpegEncContext *s, const uint8_t *a, const uint8_t *b, return 0; } -int ff_set_cmp(const MECmpContext *c, me_cmp_func *cmp, int type) +av_cold int ff_set_cmp(const MECmpContext *c, me_cmp_func *cmp, int type, int mpvenc) { - int ret = 0; - int i; - - memset(cmp, 0, sizeof(void *) * 6); - - for (i = 0; i < 6; i++) { - switch (type & 0xFF) { - case FF_CMP_SAD: - cmp[i] = c->sad[i]; - break; - case FF_CMP_MEDIAN_SAD: - cmp[i] = c->median_sad[i]; - break; - case FF_CMP_SATD: - cmp[i] = c->hadamard8_diff[i]; - break; - case FF_CMP_SSE: - cmp[i] = c->sse[i]; - break; - case FF_CMP_DCT: - cmp[i] = c->dct_sad[i]; - break; - case FF_CMP_DCT264: - cmp[i] = c->dct264_sad[i]; - break; - case FF_CMP_DCTMAX: - cmp[i] = c->dct_max[i]; - break; - case FF_CMP_PSNR: - cmp[i] = c->quant_psnr[i]; - break; - case FF_CMP_BIT: - cmp[i] = c->bit[i]; - break; - case FF_CMP_RD: - cmp[i] = c->rd[i]; - break; - case FF_CMP_VSAD: - cmp[i] = c->vsad[i]; - break; - case FF_CMP_VSSE: - cmp[i] = c->vsse[i]; - break; - case FF_CMP_ZERO: - cmp[i] = zero_cmp; - break; - case FF_CMP_NSSE: - cmp[i] = c->nsse[i]; - break; -#if CONFIG_DWT - case FF_CMP_W53: - cmp[i]= c->w53[i]; - break; - case FF_CMP_W97: - cmp[i]= c->w97[i]; - break; +#define ENTRY(CMP_FLAG, ARRAY, MPVENC_ONLY) \ + [FF_CMP_ ## CMP_FLAG] = { \ + .offset = offsetof(MECmpContext, ARRAY), \ + .mpv_only = MPVENC_ONLY, \ + .available = 1, \ + } + static const struct { + char available; + char mpv_only; + uint16_t offset; + } cmp_func_list[] = { + ENTRY(SAD, sad, 0), + ENTRY(SSE, sse, 0), + ENTRY(SATD, hadamard8_diff, 0), + ENTRY(DCT, dct_sad, 1), + ENTRY(PSNR, quant_psnr, 1), + ENTRY(BIT, bit, 1), + ENTRY(RD, rd, 1), + ENTRY(VSAD, vsad, 0), + ENTRY(VSSE, vsse, 0), + ENTRY(NSSE, nsse, 0), +#if CONFIG_SNOW_DECODER || CONFIG_SNOW_ENCODER + ENTRY(W53, w53, 0), + ENTRY(W97, w97, 0), #endif - default: - av_log(NULL, AV_LOG_ERROR, - "invalid cmp function selection\n"); - ret = -1; - break; - } + ENTRY(DCTMAX, dct_max, 1), +#if CONFIG_GPL + ENTRY(DCT264, dct264_sad, 1), +#endif + ENTRY(MEDIAN_SAD, median_sad, 0), + }; + const me_cmp_func *me_cmp_func_array; + + type &= 0xFF; + + if (type == FF_CMP_ZERO) { + for (int i = 0; i < 6; i++) + cmp[i] = zero_cmp; + return 0; + } + if (type > FF_ARRAY_ELEMS(cmp_func_list) || + !cmp_func_list[type].available || + !mpvenc && cmp_func_list[type].mpv_only) { + av_log(NULL, AV_LOG_ERROR, + "invalid cmp function selection\n"); + return AVERROR(EINVAL); } + me_cmp_func_array = (const me_cmp_func*)(((const char*)c) + cmp_func_list[type].offset); + for (int i = 0; i < 6; i++) + cmp[i] = me_cmp_func_array[i]; - return ret; + return 0; } #define BUTTERFLY2(o1, o2, i1, i2) \ diff --git a/libavcodec/me_cmp.h b/libavcodec/me_cmp.h index b9abc7fb8e..9053327c4c 100644 --- a/libavcodec/me_cmp.h +++ b/libavcodec/me_cmp.h @@ -83,7 +83,14 @@ void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx); void ff_me_cmp_init_x86(MECmpContext *c, AVCodecContext *avctx); void ff_me_cmp_init_mips(MECmpContext *c, AVCodecContext *avctx); -int ff_set_cmp(const MECmpContext *c, me_cmp_func *cmp, int type); +/** + * Fill the function pointer array cmp[6] with me_cmp_funcs from + * c based upon type. If mpvenc is not set, an error is returned + * if the type of comparison functions requires an initialized + * MpegEncContext. + */ +int ff_set_cmp(const MECmpContext *c, me_cmp_func *cmp, + int type, int mpvenc); void ff_dsputil_init_dwt(MECmpContext *c); diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c index b29d0c6d96..13f3d8040e 100644 --- a/libavcodec/motion_est.c +++ b/libavcodec/motion_est.c @@ -305,7 +305,8 @@ static int zero_cmp(MpegEncContext *s, const uint8_t *a, const uint8_t *b, static void zero_hpel(uint8_t *a, const uint8_t *b, ptrdiff_t stride, int h){ } -av_cold int ff_me_init(MotionEstContext *c, AVCodecContext *avctx, const MECmpContext *mecc) +av_cold int ff_me_init(MotionEstContext *c, AVCodecContext *avctx, + const MECmpContext *mecc, int mpvenc) { int cache_size = FFMIN(ME_MAP_SIZE>>ME_MAP_SHIFT, 1<dia_size) & 255, FFABS(avctx->pre_dia_size) & 255); @@ -324,10 +325,10 @@ av_cold int ff_me_init(MotionEstContext *c, AVCodecContext *avctx, const MECmpCo if (cache_size < 2 * dia_size) av_log(avctx, AV_LOG_INFO, "ME_MAP size may be a little small for the selected diamond size\n"); - ret = ff_set_cmp(mecc, c->me_pre_cmp, avctx->me_pre_cmp); - ret |= ff_set_cmp(mecc, c->me_cmp, avctx->me_cmp); - ret |= ff_set_cmp(mecc, c->me_sub_cmp, avctx->me_sub_cmp); - ret |= ff_set_cmp(mecc, c->mb_cmp, avctx->mb_cmp); + ret = ff_set_cmp(mecc, c->me_pre_cmp, avctx->me_pre_cmp, mpvenc); + ret |= ff_set_cmp(mecc, c->me_cmp, avctx->me_cmp, mpvenc); + ret |= ff_set_cmp(mecc, c->me_sub_cmp, avctx->me_sub_cmp, mpvenc); + ret |= ff_set_cmp(mecc, c->mb_cmp, avctx->mb_cmp, mpvenc); if (ret < 0) return ret; diff --git a/libavcodec/motion_est.h b/libavcodec/motion_est.h index 5547aeb8bc..243b73ff4e 100644 --- a/libavcodec/motion_est.h +++ b/libavcodec/motion_est.h @@ -115,7 +115,7 @@ static inline int ff_h263_round_chroma(int x) * Performs one-time initialization of the MotionEstContext. */ int ff_me_init(MotionEstContext *c, struct AVCodecContext *avctx, - const struct MECmpContext *mecc); + const struct MECmpContext *mecc, int mpvenc); void ff_me_init_pic(struct MpegEncContext *s); diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 6059bdee11..8022fe474a 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -312,15 +312,15 @@ static av_cold int me_cmp_init(MpegEncContext *s, AVCodecContext *avctx) int ret; ff_me_cmp_init(&s->mecc, avctx); - ret = ff_me_init(&s->me, avctx, &s->mecc); + ret = ff_me_init(&s->me, avctx, &s->mecc, 1); if (ret < 0) return ret; - ret = ff_set_cmp(&s->mecc, me_cmp, s->frame_skip_cmp); + ret = ff_set_cmp(&s->mecc, me_cmp, s->frame_skip_cmp, 1); if (ret < 0) return ret; s->frame_skip_cmp_fn = me_cmp[1]; if (avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) { - ret = ff_set_cmp(&s->mecc, me_cmp, avctx->ildct_cmp); + ret = ff_set_cmp(&s->mecc, me_cmp, avctx->ildct_cmp, 1); if (ret < 0) return ret; if (!me_cmp[0] || !me_cmp[4]) diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index 9d64b1efe2..819a7933fe 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -217,7 +217,7 @@ static av_cold int encode_init(AVCodecContext *avctx) mcf(12,12) ff_me_cmp_init(&enc->mecc, avctx); - ret = ff_me_init(&enc->m.me, avctx, &enc->mecc); + ret = ff_me_init(&enc->m.me, avctx, &enc->mecc, 0); if (ret < 0) return ret; ff_mpegvideoencdsp_init(&enc->mpvencdsp, avctx); diff --git a/libavcodec/svq1enc.c b/libavcodec/svq1enc.c index ceb8bf83c2..5413508217 100644 --- a/libavcodec/svq1enc.c +++ b/libavcodec/svq1enc.c @@ -589,7 +589,7 @@ static av_cold int svq1_encode_init(AVCodecContext *avctx) ff_hpeldsp_init(&s->hdsp, avctx->flags); ff_me_cmp_init(&s->mecc, avctx); - ret = ff_me_init(&s->m.me, avctx, &s->mecc); + ret = ff_me_init(&s->m.me, avctx, &s->mecc, 0); if (ret < 0) return ret; ff_mpegvideoencdsp_init(&s->m.mpvencdsp, avctx); -- 2.40.1 _______________________________________________ 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".