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 B18D245636 for ; Wed, 8 Feb 2023 17:38:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BB05168BED2; Wed, 8 Feb 2023 19:38:24 +0200 (EET) Received: from mail-vs1-f43.google.com (mail-vs1-f43.google.com [209.85.217.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFB2968BEC5 for ; Wed, 8 Feb 2023 19:38:17 +0200 (EET) Received: by mail-vs1-f43.google.com with SMTP id k6so20734915vsk.1 for ; Wed, 08 Feb 2023 09:38:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=pdARgSOTdxZng7WKBfIgtVEcKMX6KGqXc79XFH6Rk50=; b=MrnFIuMKF/w5YuD2vTHDGxowz8fbTiZEMlczWnnKbxIR9y6HF0GwcW2G0bkucrpigf vd25WUwMTnpc9JPF73b4DhEpO5vdfKiurDRVRtBLdhnm6MVfemWPO33MEcVDsgoGzXrA DnFrLwhwCSdC3+hRZL1we9pkIKlzThtb67Pn6Jx6BjoTPR7X6Qo0wTwzj4Y3QvxdaOry Yl8EOM1TB8iIvfB8VaqbazC/EzO/NwVaKjDNUBYYDNgC9EbhcBrPA3wTJxYeStboXAgN ES7uEcJCcehFg1PEOHOlDxsvXeau7t9t4VEL4yyB303ch+fd2OckiHrDrCTkEtoFvfUK LDJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=pdARgSOTdxZng7WKBfIgtVEcKMX6KGqXc79XFH6Rk50=; b=P9UgPHRx3D9S24FJoeqta1m9k45UZH2DHBGieJ3uJNMnoretsvG7r9GU+Qr1ETXBNJ Ldz1HT2mktpUUwI4wE3RTJC/sr6/jJuQuHV8bXdTbo96hibgfilB6F3/5GOGvjQ+ING9 7vB5wh/3H0qvqhj04aOnY3cQgk1y9YCtFtGQK9yBaLd+/PpD2MQ+y77N4vsvin4KY7nh P9POdk9RWPQqSM3/LGceiJmGe6c3k2F+FVRnFMibL7EoPWak32CGdNDnc/BuU9OO6p4p 8sK6duhXtZ7aBeEHuTbgd2KCbw1TMz11sWlPgdWdOGQ9ro7yY3nFy2Rdck/M8Jg+128+ POdA== X-Gm-Message-State: AO0yUKVvedPPN6KZpeZkfCZxp67U49M+iRaRvxj3mBNhR3WNx4ghpT+G ewaQUfkKGimPz9l20d6WAjdUBXq2rnLeJLDOzRcERG0Q X-Google-Smtp-Source: AK7set9mu3kwXT7jZ2FPIb8jUwZpEyOXR9kUjHCIqI+8QS7+Uh+JP9ao+EH6fvUkLxILP5cqWMxEOhUHjzBbO2sVd2g= X-Received: by 2002:a67:b20f:0:b0:40e:251f:cdc0 with SMTP id b15-20020a67b20f000000b0040e251fcdc0mr2587044vsf.24.1675877895973; Wed, 08 Feb 2023 09:38:15 -0800 (PST) MIME-Version: 1.0 From: Paul B Mahol Date: Wed, 8 Feb 2023 18:37:58 +0100 Message-ID: To: FFmpeg development discussions and patches Content-Type: multipart/mixed; boundary="000000000000ad9e7705f433ba45" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH] swresample: try to fix regression 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --000000000000ad9e7705f433ba45 Content-Type: text/plain; charset="UTF-8" This one should pass FATE. --000000000000ad9e7705f433ba45 Content-Type: text/x-patch; charset="US-ASCII"; name="0001-swresample-do-not-attempt-to-rematrix-if-channel-map.patch" Content-Disposition: attachment; filename="0001-swresample-do-not-attempt-to-rematrix-if-channel-map.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_ldvyev490 RnJvbSBjYTU0ZjI0MTc1NmU3NjRmNzBjOTE5YWNkMGM5OWM4MTE3NjJkY2IxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIEIgTWFob2wgPG9uZW1kYUBnbWFpbC5jb20+CkRhdGU6 IFdlZCwgOCBGZWIgMjAyMyAxODozNTozOCArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIHN3cmVzYW1w bGU6IGRvIG5vdCBhdHRlbXB0IHRvIHJlbWF0cml4IGlmIGNoYW5uZWwgbWFwIGlzCiBwcm92aWRl ZAoKU2lnbmVkLW9mZi1ieTogUGF1bCBCIE1haG9sIDxvbmVtZGFAZ21haWwuY29tPgotLS0KIGxp YmF2ZmlsdGVyL2FmX3Bhbi5jICAgICAgIHwgNiArLS0tLS0KIGxpYnN3cmVzYW1wbGUvc3dyZXNh bXBsZS5jIHwgNCArKy0tCiAyIGZpbGVzIGNoYW5nZWQsIDMgaW5zZXJ0aW9ucygrKSwgNyBkZWxl dGlvbnMoLSkKCmRpZmYgLS1naXQgYS9saWJhdmZpbHRlci9hZl9wYW4uYyBiL2xpYmF2ZmlsdGVy L2FmX3Bhbi5jCmluZGV4IDgwYzE5NGIwNjYuLjA2N2Y2NDY4MDUgMTAwNjQ0Ci0tLSBhL2xpYmF2 ZmlsdGVyL2FmX3Bhbi5jCisrKyBiL2xpYmF2ZmlsdGVyL2FmX3Bhbi5jCkBAIC0zMTMsOSArMzEz LDcgQEAgc3RhdGljIGludCBjb25maWdfcHJvcHMoQVZGaWx0ZXJMaW5rICpsaW5rKQogICAgICAg ICAgICAgcGFuLT5jaGFubmVsX21hcFtpXSA9IGNoX2lkOwogICAgICAgICB9CiAKLSAgICAgICAg YXZfb3B0X3NldF9jaGxheW91dChwYW4tPnN3ciwgImljaGwiLCAmbGluay0+Y2hfbGF5b3V0LCAw KTsKLSAgICAgICAgYXZfb3B0X3NldF9jaGxheW91dChwYW4tPnN3ciwgIm9jaGwiLCAmcGFuLT5v dXRfY2hhbm5lbF9sYXlvdXQsIDApOwotICAgICAgICBhdl9vcHRfc2V0X2ludChwYW4tPnN3ciwg InVjaCIsIGxpbmstPmNoX2xheW91dC5uYl9jaGFubmVscywgMCk7CisgICAgICAgIGF2X29wdF9z ZXRfaW50KHBhbi0+c3dyLCAidWNoIiwgcGFuLT5uYl9vdXRwdXRfY2hhbm5lbHMsIDApOwogICAg ICAgICBzd3Jfc2V0X2NoYW5uZWxfbWFwcGluZyhwYW4tPnN3ciwgcGFuLT5jaGFubmVsX21hcCk7 CiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gcmVub3JtYWxpemUKQEAgLTMzNSw4ICszMzMsNiBA QCBzdGF0aWMgaW50IGNvbmZpZ19wcm9wcyhBVkZpbHRlckxpbmsgKmxpbmspCiAgICAgICAgICAg ICBmb3IgKGogPSAwOyBqIDwgbGluay0+Y2hfbGF5b3V0Lm5iX2NoYW5uZWxzOyBqKyspCiAgICAg ICAgICAgICAgICAgcGFuLT5nYWluW2ldW2pdIC89IHQ7CiAgICAgICAgIH0KLSAgICAgICAgYXZf b3B0X3NldF9jaGxheW91dChwYW4tPnN3ciwgImljaGwiLCAmbGluay0+Y2hfbGF5b3V0LCAwKTsK LSAgICAgICAgYXZfb3B0X3NldF9jaGxheW91dChwYW4tPnN3ciwgIm9jaGwiLCAmcGFuLT5vdXRf Y2hhbm5lbF9sYXlvdXQsIDApOwogICAgICAgICBzd3Jfc2V0X21hdHJpeChwYW4tPnN3ciwgcGFu LT5nYWluWzBdLCBwYW4tPmdhaW5bMV0gLSBwYW4tPmdhaW5bMF0pOwogICAgIH0KIApkaWZmIC0t Z2l0IGEvbGlic3dyZXNhbXBsZS9zd3Jlc2FtcGxlLmMgYi9saWJzd3Jlc2FtcGxlL3N3cmVzYW1w bGUuYwppbmRleCA1ODg0ZjhkNTMzLi43YzhkOWJmYzk3IDEwMDY0NAotLS0gYS9saWJzd3Jlc2Ft cGxlL3N3cmVzYW1wbGUuYworKysgYi9saWJzd3Jlc2FtcGxlL3N3cmVzYW1wbGUuYwpAQCAtMzEy LDkgKzMxMiw5IEBAIGF2X2NvbGQgaW50IHN3cl9pbml0KHN0cnVjdCBTd3JDb250ZXh0ICpzKXsK ICAgICBpZiAocy0+b3V0X2NoX2xheW91dC5vcmRlciA9PSBBVl9DSEFOTkVMX09SREVSX1VOU1BF QykKICAgICAgICAgYXZfY2hhbm5lbF9sYXlvdXRfZGVmYXVsdCgmcy0+b3V0X2NoX2xheW91dCwg cy0+b3V0LmNoX2NvdW50KTsKIAotICAgIHMtPnJlbWF0cml4ID0gYXZfY2hhbm5lbF9sYXlvdXRf Y29tcGFyZSgmcy0+b3V0X2NoX2xheW91dCwgJnMtPmluX2NoX2xheW91dCkgfHwKKyAgICBzLT5y ZW1hdHJpeCA9ICFzLT5jaGFubmVsX21hcCAmJiAoYXZfY2hhbm5lbF9sYXlvdXRfY29tcGFyZSgm cy0+b3V0X2NoX2xheW91dCwgJnMtPmluX2NoX2xheW91dCkgfHwKICAgICAgICAgICAgICAgICAg cy0+cmVtYXRyaXhfdm9sdW1lIT0xLjAgfHwKLSAgICAgICAgICAgICAgICAgcy0+cmVtYXRyaXhf Y3VzdG9tOworICAgICAgICAgICAgICAgICBzLT5yZW1hdHJpeF9jdXN0b20pOwogCiAgICAgaWYo cy0+aW50X3NhbXBsZV9mbXQgPT0gQVZfU0FNUExFX0ZNVF9OT05FKXsKICAgICAgICAgaWYoICAg YXZfZ2V0X2J5dGVzX3Blcl9zYW1wbGUocy0+IGluX3NhbXBsZV9mbXQpIDw9IDIKLS0gCjIuMzku MQoK --000000000000ad9e7705f433ba45 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --000000000000ad9e7705f433ba45--