From patchwork Mon Oct 21 17:03:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 52430 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:143:b0:48e:c0f8:d0de with SMTP id h3csp2805998vqi; Mon, 21 Oct 2024 10:03:49 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCU5nQDIf9gSNy4No5sOiovE/pNUM8TqTyeuN4H+3VgFm3H6zS/RnfD9xMY9Qr/kkNJJW00TxxcUgQC3czoKq04h@gmail.com X-Google-Smtp-Source: AGHT+IFnhw7CkFXbFATX/zm0kmcMlEG20mWycXzvuVbB+LX/cBoRoE9MPwyBUVAyZ8WGxkyQbEDD X-Received: by 2002:a05:6512:3d05:b0:534:3cdc:dbef with SMTP id 2adb3069b0e04-53a154b2c68mr5371207e87.43.1729530229108; Mon, 21 Oct 2024 10:03:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1729530229; cv=none; d=google.com; s=arc-20240605; b=hx600HQKml/HtcZuhhDUTxtQOeCUuL2zl5k8yhbLiaNWtC4Ow0e3NA7JwScFlGlC/R 3jOsIggg+nGTK6FYw/6g7X2d1H4pS9BhMC9nHoux45EJS1e5klMz+PWyjzbGKscwOOMO Ta29+k1j3f7TRyISoC6lZtts99nBygwJDvm7A/kt8+tmAhUtG4gBaYBj89cDeTE6sAoB RBPVPGPau9lJL9hWJpxCAVv402W1JHYR0qSUVHydiKwoRDVzwk8hwIW3bP377xnHlhDP 5OX+oc6KSGt69Kt/7ypSSuX4uYiNuyXfDq+G7FxyzyPPBlAAueDEgl5I3Ug6y7a2iNO4 6/fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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:date:to:from:message-id :dkim-signature:delivered-to; bh=8CziA8YUS5cp3/ytskyWPyCNLQya4A+IHjD5TBxvTIM=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=b1opAdR10GmyW43vqk2wkpr/a83Y1UscQvP3LI/bYVZeByZM0O8WExjzJyJYTAB/QI 4awVCxRPAT8RMoBvSM9QUIg8QfJzLCap+O7WDXedr8h+i2Ruf5yf/HWCF0c5DfVVD9wn B7C85MFaFgPWY2PW81w8RgBTJIHoRtNbVrI8LKCI0MwrqlD440s06/Eg1Y3bwM1pXLTJ +foLoWNT4JV9hegCR6GSdmUHg3MqiEguJeGT8K66U2Tu1Amf1WEDFR9bpgxcXggFitMN FxB69SKVNA0CQRAoAUAEtS9AegObqsWWe549iuMAbZIbuzZo1BCAG9hOkaM2PswsxJfh 4hGg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=Jtm7eyGm; 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=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-53a2245a365si1221880e87.614.2024.10.21.10.03.48; Mon, 21 Oct 2024 10:03:49 -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=@foxmail.com header.s=s201512 header.b=Jtm7eyGm; 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=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 38D6868D9BD; Mon, 21 Oct 2024 20:03:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-221.mail.qq.com (out203-205-221-221.mail.qq.com [203.205.221.221]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5619F68D9BD for ; Mon, 21 Oct 2024 20:03:35 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1729530207; bh=ido+qa8TsGW/ThKUe3VhL3A+Cl4RgXvY1vkOvz6szTo=; h=From:To:Cc:Subject:Date; b=Jtm7eyGmix8giJ6LOH+j6OYN1h9j6I7fQ8vvpVh723n6/F13eFIlBnl7izn8pLa9U fjXaZVoV5Pf9zJ9d1EwaLeAVvF5npaqFLqDCE1jGsRJ1gAXOlcvU6J7TNKWAoZ6th3 ZRvyt2G8hBgdcNq51om83gIbV5+hWp5y4ZK+GhMM= Received: from ZHILIZHAO-MB1.tencent.com ([113.118.104.142]) by newxmesmtplogicsvrsza36-0.qq.com (NewEsmtp) with SMTP id DA24E02; Tue, 22 Oct 2024 01:03:26 +0800 X-QQ-mid: xmsmtpt1729530206tobb9nomo Message-ID: X-QQ-XMAILINFO: OZZSS56D9fAjHbpLh1esT3bWwemMD7/3xdjA1KYoi9IJmjx2Iwef+s7YE05nov VWLFNRFAQ0phDvJjBhutaK9QnFH7Bz+UC/CGEUGMmnWp36wcP7zUZhwSveMnH+T6Uu3gZkWaInN3 Ky4Ukp/Z4B12++YpRrgX6nguyBzIiwwNLXUtvgEYJs+uNLiLD5kEOBNeJmJeJ2Cq5gOf/IQtTKPg rjEuHE9t4A4wDo464uUvKQ0lySzP4Fi/ohX+oRFmBLFPGEGE49vcgO/X2rjscXp5bdsyMTiGhHyj QwWAa/hGP7AIZYh87jK1s8U6SHqyRQFvp9BMdBCTZ8qqYPDMlLnfyozUZy3/+JM/4JkcU2I2L3pj YG53h/sKPWHzfm7MfzyljJdeccJE9XWShyxhbwEz4cKGGCXRbMTmVJ9wRgeD0OX332s2sJKA43JY O0LKf0gpyXJul8ZDABj+G4hQPEjbE8Z0XnFafoxtDuOh+p3qMk9I/PUvXHGdp4Is7LwIzAvLQQNS LpGnlMjf46AcYpfntXZSSj6BrOqQAkG0a+gNAaV7y94h5vp8oz2GDUkwlXH5Zn4d4IBWcBn59T6R Vvg2o8EDGNByjlBNTVKbn23ez+6EHiuKjSnglcC2oG51htJgmEwzO89DNSQ3lTDK1qtSqRVb+MUF F9ouiTaWgLRcIF4NsgMOLfHwA1vMFG/SQN6xmGMvKLuqf5XAczAv1ZSQzSVnUsINej+Kgn/6Y8YC fbxrgsfBItuNVOlE/S51azvHBUXDmlSAKX0/pqQO5MJKd1nmNn1M30BS2Fge2zOGp23Hle647PPv recisnjWP0eLE/F9+2DeC1LXmJ9j+xCjVHxhJyinW+5i8E5q2647Ki08EsMokS0klhYVPqspBjo8 GZw0anSLc6Ow80Xhdwlm3eRRmL4wwmpfbujkSnZqtBknooLvpEU0kK4eJfT19fJJOSZVolqbMVnm Kw1OUiwaueIpHndTrt9fwuk32UcxIi5/v24okg1b20WC1RQGinVA7FzvSE/eamm/EVTVVrrLO5yz GEOwZPnA== X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Oct 2024 01:03:24 +0800 X-OQ-MSGID: <20241021170324.81936-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] tests/fate-run: Fix pixdesc failure 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EJJRFZ5v4MCJ From: Zhao Zhili -u and -q doesn't work together for diff on macOS. --- tests/fate-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/fate-run.sh b/tests/fate-run.sh index f8d67de25a..c371bd1c3c 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -519,7 +519,7 @@ pixdesc(){ $FLAGS $ENC_OPTS -vf "scale,format=$pix_fmt,pixdesctest" -vcodec rawvideo -frames:v 5 \ "-pix_fmt $pix_fmt" -f nut md5:$md5file2 - diff -u -q $md5file1 $md5file2 || return + diff -q $md5file1 $md5file2 || return printf '%-20s' $label cat $md5file1 }