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 ESMTPS id EF9774DB0D for ; Fri, 28 Feb 2025 12:12:38 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BB80668DB78; Fri, 28 Feb 2025 14:12:33 +0200 (EET) Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 378FB68DA51 for ; Fri, 28 Feb 2025 14:12:27 +0200 (EET) Received: by mail-lf1-f48.google.com with SMTP id 2adb3069b0e04-5495078cd59so580060e87.1 for ; Fri, 28 Feb 2025 04:12:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20230601.gappssmtp.com; s=20230601; t=1740744746; x=1741349546; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vW2YDn7njqTLwYs1up1utiCZPpcu/EOEbhub19h/ads=; b=eZ6Cv2Zzu9K02I/85Zh3PiWQQlj3GOzp7GONTCZN8oYaYF9ZR35s9ufQWV2U85qdk5 AAWiba84iHN12c3CzVuLdNsBldSr4CyjT2MnbU5sprYwo+5t9o0Bq65+OVrygt8GHoAM MkA55l7/b6vDMC8GC7+1em8RfEoArfGgBiD6LwZqa4jUwVQEE+xuJ2fYvsAU+tV7ZJrn oaY5yCCZ7upoeUtUi0rtxjKY+IQlj7j/iCbKOLuNINPm4GQ+UhA4s5LajH5n5jxkYlFO PQj5fEGp/DRmIB+i87j4BztkPSX1L+ppB5sRRdXN/BcpD9s140DgjkSKeN22GRn9ojF4 qN6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740744746; x=1741349546; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vW2YDn7njqTLwYs1up1utiCZPpcu/EOEbhub19h/ads=; b=VAd6G5RTDqA6s8njsjIcPp8Io2KlSmXNNUbEuJ0wbe0UK4ADOOJbT3PrJ76OcfOOaV +i291kHUbkZYQUNKGCcZs+apNKMMEL3QrYHfi6JLIku5t23VmNdyIABbuWJyyhPPdmGr In12ghIZ+0q9MB8ioJrmH0ehLPHaGazs24F3giwKXgho18zjCkXs2NEFT9lBy9on9xcE Gakk1DfOYOLFENdzLfnCrlWp/yU3K63nf880uLvz025hsSSohs019E2o0ll9HOiXAgzP FhjF+zmxDTbdcFV+1pQfQydihB8e9J2XNDGMxTHVEg7OMKeG0EU22QTi4Gn1rIMNxmY9 hYtA== X-Gm-Message-State: AOJu0Yx8VnO1jZILPVtcPuv6Mus2aKYGAKv/JJ0Cx00vsWzMZImKVPrW HSBTzWFbQrN8ZyJVc6CN3mX+7LthBaHg/lGwF5bDRxRVBlLTLB4w3IRIpF6GV8rhLw+pcSVHkrx PiAKN X-Gm-Gg: ASbGncudvJ5lrBgUpij4V6//dNq9FovmUZTOFRjYsWWViW3+/W/Xco8Ilp1voFLlRj0 R89vkm3A3LwnZ7wBSZOtYGOaE8CWSrWupKYT6GfH+EQviz0Hz/ziFZI7jxOVPccRnpQMnPDjbXN 0+feju9/9R0kxA0HLAbRtak/P089XOaNZqWudXianfkKXWo0ZXgda3AkYb4+KX0x/fzjWC88rIo UYL8h6gBtTAa5bfOBWMmAnLa4jun363ImivLQ4HV4C02z81kNOS89rVC4SteGBAoQl2KGiUXht7 pOPDSDYPdHT6nK1hZw/zkgLQlRZxAu+i21MUflIPOQWL3DJNYmnd8GraGZDVX7sL/HF1 X-Google-Smtp-Source: AGHT+IF1IiOMPXn2dLErRX7/jCfN1FbHwM3GGp5HKj4L06sy5QQe+2znGT86q2Xi4zdm5Ow2diny5w== X-Received: by 2002:a05:6512:6d2:b0:545:aa5:d455 with SMTP id 2adb3069b0e04-5494c323289mr1260156e87.15.1740744745719; Fri, 28 Feb 2025 04:12:25 -0800 (PST) Received: from localhost (dsl-tkubng21-50de30-198.dhcp.inet.fi. [80.222.48.198]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-5494d58d177sm246757e87.66.2025.02.28.04.12.25 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 28 Feb 2025 04:12:25 -0800 (PST) From: =?UTF-8?q?Martin=20Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 Feb 2025 14:12:24 +0200 Message-Id: <20250228121224.56806-1-martin@martin.st> X-Mailer: git-send-email 2.39.5 (Apple Git-154) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] aarch64: Fix a few misindented lines 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: Krzysztof Pyrkosz 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: --- Will push soon, as this is quite trivial. --- libswresample/aarch64/resample.S | 8 ++++---- libswscale/aarch64/yuv2rgb_neon.S | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libswresample/aarch64/resample.S b/libswresample/aarch64/resample.S index 6d9eaaeb23..89edd1ce60 100644 --- a/libswresample/aarch64/resample.S +++ b/libswresample/aarch64/resample.S @@ -30,7 +30,7 @@ function ff_resample_common_apply_filter_x4_float_neon, export=1 faddp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values faddp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values st1 {v0.s}[0], [x0], #4 // write accumulator - ret + ret endfunc function ff_resample_common_apply_filter_x8_float_neon, export=1 @@ -46,7 +46,7 @@ function ff_resample_common_apply_filter_x8_float_neon, export=1 faddp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values faddp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values st1 {v0.s}[0], [x0], #4 // write accumulator - ret + ret endfunc function ff_resample_common_apply_filter_x4_s16_neon, export=1 @@ -59,7 +59,7 @@ function ff_resample_common_apply_filter_x4_s16_neon, export=1 addp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values addp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values st1 {v0.s}[0], [x0], #4 // write accumulator - ret + ret endfunc function ff_resample_common_apply_filter_x8_s16_neon, export=1 @@ -73,5 +73,5 @@ function ff_resample_common_apply_filter_x8_s16_neon, export=1 addp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values addp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values st1 {v0.s}[0], [x0], #4 // write accumulator - ret + ret endfunc diff --git a/libswscale/aarch64/yuv2rgb_neon.S b/libswscale/aarch64/yuv2rgb_neon.S index cc7d8b58fc..0797a6d5e0 100644 --- a/libswscale/aarch64/yuv2rgb_neon.S +++ b/libswscale/aarch64/yuv2rgb_neon.S @@ -126,7 +126,7 @@ .endm .macro load_chroma_yuv422p - load_chroma_yuv420p + load_chroma_yuv420p .endm .macro increment_nv12 @@ -136,7 +136,7 @@ .endm .macro increment_nv21 - increment_nv12 + increment_nv12 .endm .macro increment_yuv420p @@ -182,7 +182,7 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1 mov w8, w0 // w8 = width 2: movi v5.8h, #4, lsl #8 // 128 * (1<<3) - load_chroma_\ifmt + load_chroma_\ifmt sub v18.8h, v18.8h, v5.8h // U*(1<<3) - 128*(1<<3) sub v19.8h, v19.8h, v5.8h // V*(1<<3) - 128*(1<<3) sqdmulh v20.8h, v19.8h, v1.h[0] // V * v2r (R) @@ -237,11 +237,11 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1 add x15, x15, w16, sxtw // dst2 += padding2 .endif add x4, x4, w5, sxtw // srcY += paddingY - increment_\ifmt + increment_\ifmt subs w1, w1, #1 // height -= 1 b.gt 1b mov w0, w9 - ret + ret endfunc .endm -- 2.39.5 (Apple Git-154) _______________________________________________ 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".