From patchwork Tue Dec 27 23:18:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 39786 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp3762220pzb; Tue, 27 Dec 2022 15:21:22 -0800 (PST) X-Google-Smtp-Source: AMrXdXti7Qc3Tu8o6Qe8oBsqL/p+1qu08kUPIMwxL+6JNbOwqKAVVH4iTZNfA0t5C2SNS9/InmML X-Received: by 2002:a17:906:b087:b0:846:8c9a:68a0 with SMTP id x7-20020a170906b08700b008468c9a68a0mr15363877ejy.30.1672183282414; Tue, 27 Dec 2022 15:21:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672183282; cv=none; d=google.com; s=arc-20160816; b=HYyW9EnEfgf3uXMyTfVK6XYggRrAyRSGp56KHpjlWQJKHxkGNQ9dX8AeBZDqW0J4/5 Ad6aYm0IT+V28MNmKObySOvic2PKaFb2VkiYwDdJzyfJFSvD1FWTe62hwyRj06Yzijid NuYUckRN+DEFPsvnJm1c+PDaR5u770es47GFONIoYGNl0X5b6vIiwg5RDNIfLck3UXcG u4mSZL9LzU1d76BDL8xQx8lWg/CJzLPw5AgOcrxAC0+hZexSULitgBZ82S3U226MdcHz /+0NCAj8aKRWZeycD3f0qrY5yY6fgKQXOS2ZgN1WtKkXZqRxO05Lge6FIRgku5GGng8j 6MIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=aaVVLKdk4PZRjhTlLgbRISiCWJCV47kVhTtYcC6pVHQ=; b=nhgDhPk6LGkDeKrVQe1cFS/l52JvkJzEYtpmptCyLLMGvbGFU0rkTDMP3eSKSF7n0W phck0KIm1zVAngbGhUuYIsTTVorYmFXU6LpauouFeITLkNfXIfeEHp4feab6Y19bTG+N 8KfzKWMAzO8+6jn8A9cJkCnbGpgFPqwv95TkZECZLK8K5x7BTNLpWWUAGN0lIpzp3BFh +7D+XmrfikxOulfGR/HEbOfp/pUIXL3US6YJV7rb+LXCuA9W63PKgV3HUSxPjnkV5eca UP7eQi/Syv7NuCu/JWi/5dTs3o13pXFxHEYUgywaM7KBw9WzxUx/PSyHQLoXBP/4SKc3 9keg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b="mC/qWIQ0"; 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=NONE dis=NONE) header.from=pkh.me Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g23-20020a170906349700b007813b1924ccsi9676357ejb.934.2022.12.27.15.21.22; Tue, 27 Dec 2022 15:21:22 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b="mC/qWIQ0"; 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=NONE dis=NONE) header.from=pkh.me Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4449B68BD55; Wed, 28 Dec 2022 01:18:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from ssq0.pkh.me (laubervilliers-656-1-228-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 35CBF68BCD2 for ; Wed, 28 Dec 2022 01:18:35 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pkh.me; s=selector1; t=1672183099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=irF1oucIe8S+m0golIOo1RhXyEjB6k+XySF6SpqeZss=; b=mC/qWIQ0VQISbHsjUAClXUFux8PVVExiuXAVK5HXF2u1V/V1T2Hsur1MrFXbLg0aEAcR6Y D2HvsvBCoSSP52LmvM9F4Eg9vOlwgU/cfYTGJn7/2Dy4W+pX+Jm4jFuqTj0PwLVyhw3Axf dc+omY2ScYFba3SuHLJoOszaXeFWqrE= Received: from localhost (ssq0.pkh.me [local]) by ssq0.pkh.me (OpenSMTPD) with ESMTPA id e1129265; Tue, 27 Dec 2022 23:18:19 +0000 (UTC) From: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Dec 2022 00:18:05 +0100 Message-Id: <20221227231814.2520181-24-u@pkh.me> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221227231814.2520181-1-u@pkh.me> References: <20221105152617.1809282-1-u@pkh.me> <20221227231814.2520181-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 23/32] avfilter/palettegen: use libc qsort 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: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1v9sQM4JCvEa Now that the sort function is deterministic, we can rely on the libc sorting function. --- libavfilter/vf_palettegen.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavfilter/vf_palettegen.c b/libavfilter/vf_palettegen.c index 784e81b875..507690fa82 100644 --- a/libavfilter/vf_palettegen.c +++ b/libavfilter/vf_palettegen.c @@ -26,7 +26,6 @@ #include "libavutil/avassert.h" #include "libavutil/internal.h" #include "libavutil/opt.h" -#include "libavutil/qsort.h" #include "libavutil/intreadwrite.h" #include "avfilter.h" #include "internal.h" @@ -352,7 +351,7 @@ static AVFrame *get_palette_frame(AVFilterContext *ctx) /* sort the range by its major axis if it's not already sorted */ if (box->sorted_by != box->major_axis) { cmp_func cmpf = cmp_funcs[box->major_axis]; - AV_QSORT(&s->refs[box->start], box->len, const struct color_ref *, cmpf); + qsort(&s->refs[box->start], box->len, sizeof(struct color_ref *), cmpf); box->sorted_by = box->major_axis; }