From patchwork Sat Jan 20 23:19:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 7376 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp1213970jak; Sat, 20 Jan 2018 15:20:30 -0800 (PST) X-Google-Smtp-Source: AH8x227K/RZID/sJe/oDeO8kfGB4Htv21tPLaE5JOVg++N1olIBeCr4Qhxj/oPek6DiLf3LE7yOH X-Received: by 10.223.168.6 with SMTP id l6mr2691490wrc.29.1516490430754; Sat, 20 Jan 2018 15:20:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516490430; cv=none; d=google.com; s=arc-20160816; b=a/qA2mmigTNphPItGjdGp1ZYFGemo+m9Fg4HDwkgcVkyDUqcmnYwBgnlLyNAJwdgTB +NwSTAVXGtaOe4bPFUtN8j+tkeev5SvJGNVcAhI6AvKQQY5xK5brEKvWJzef1CtYUoYk uR9tQvQQiI2Y8CLDt6mlPuL+PVnFL4O+Ig5OiWW9OeSYcSPWoTki/NB7hgVr9Y27WatW pDiaBI03pyj8mN5A48aTMHBr26uQd7d6Kzei8MT9IvfVDuRyDXtn/SYGZTXbp407b56D b7GX5v3IggUZS2klbJUMhxl7i9lBhj/gyJ7SBrQ5NDHCt6O795kXnOywndrctNrBwdmN TJSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=bFFCzHrPNbq+j5M3Mr4D7azl6mzCAaATYxnVPLS6o0E=; b=Z7mhbQYjZiMJsO1FJNyhOD8zNRUl6+a+x/QuXOX/9I1ZtuupzpH/37wKx5fBqXYCnV j3ioZCfuX4zpBD+PtSohjvcqYlQ4j5kT4A18cp8eOQcrXN2epoqXMMtXrEBezSnzS2qF QPZ+uqGUIee2jhfHB8HTF6cagbbpSrV5MDEgSjahK73pyh/KOD3AydyGkk1ItrA6Cxao EztgMotY9jlEzV1nnIfkiOw8vWM5MBy5KtFNArArPnYKKA/YgXDFw0sGT6RQk7pSl+Iv LEpNLW7WZBCY9tLOPJ26Cpceu8XEpLO+igsyIx2hKO+L44cNMyZC6/ZYe4yrP7nPIZmi MHdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=Shb3eSlr; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a74si10660321wrc.406.2018.01.20.15.20.29; Sat, 20 Jan 2018 15:20:30 -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=@gmail.com header.s=20161025 header.b=Shb3eSlr; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 86D5468A1EC; Sun, 21 Jan 2018 01:20:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io0-f173.google.com (mail-io0-f173.google.com [209.85.223.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CED7B689FF1 for ; Sun, 21 Jan 2018 01:20:20 +0200 (EET) Received: by mail-io0-f173.google.com with SMTP id f34so5823125ioi.13 for ; Sat, 20 Jan 2018 15:20:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=SGD7lGb08RM18eVst3O3WOCEeuZ3mQpFEtJ1C60uwIs=; b=Shb3eSlr9gGn6B6+xxcbxoi8RsipEEH7OmPs9OQgcdHlGkgtErWXKUWkHtZgGNLuhO SAa/+W77g3fp9zDL2VWIU3n+HYwXdrDFUDO7OuCg7OS9ovstPigtx/mjzpkP/JEraBF9 R54/b0iU3ri2lVRAWI0mHvTPepDFxVOPxQK66MlCPQixfQQOzx1f37nM8GMQKfSYmMr/ MTYl0a70jphdphAaJhyIkUBwx7FFN1FZTgi3eyz1xWm5eKOXPRns8E3dgDQNRAJjFbuZ kbGqe1dpu0+18wpY4r8OG29i7CihcsdwtgXGuDN6OnOjIH99t+tabMYJ7MZig1Y+yf5K EZCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=SGD7lGb08RM18eVst3O3WOCEeuZ3mQpFEtJ1C60uwIs=; b=QLkielDNOuAm8iHu7QGq42/qrk96cJHpcjP2Ibw1+RRIOlzMdi69jNH/D06n8+tmE9 pGiVcva9o1HriDxNSfE3BKbBLhRB1RRkJELw9ZzbqrCutCd4YS2wjU26C+MJl9PlaSkT ohax8FA4XOwF0LX8uZwkmsq7PvsEAydrmAt0kME0JtOIZp7RRZijlcVw5Mz1EXDZSBrF UAiUdQhbnxYhMRsfsrEbQBl1tD1m3rNU4xEvRIe4JuocEh8FCVNV1B5TVOCbeJRGOSJG x7cJ9/d5wexMQbWwo+NvIpVeIveXebA4J0vF5Mih/qG9wKACm+AkbXaxAuV078HPmxv0 CHEA== X-Gm-Message-State: AKwxytc/yg6ze04nObP8Txp+BJDPdqeeU3CcrtmnrvbCmW6YfH7hbzLD gKnM868yiIBcc+yehAc1BPzPXK4VJmha0G2qKPc= X-Received: by 10.107.19.140 with SMTP id 12mr3371161iot.31.1516490420442; Sat, 20 Jan 2018 15:20:20 -0800 (PST) MIME-Version: 1.0 Received: by 10.2.138.170 with HTTP; Sat, 20 Jan 2018 15:19:59 -0800 (PST) From: Carl Eugen Hoyos Date: Sun, 21 Jan 2018 00:19:59 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/aarch64/h264_init_aarch64: Fix weight function prototypes X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Hi! Attached patch fixes a warning when compiling for aarch64, fate passes. Please comment, Carl Eugen From a7f0de38974a6a3a651b6f3e0d46180c67a154c1 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 21 Jan 2018 00:17:19 +0100 Subject: [PATCH] lavc/aarch64/h264dsp_init_aarch64: Fix weight function prototypes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes the following warnings: libavcodec/aarch64/h264dsp_init_aarch64.c: In function ‘ff_h264dsp_init_aarch64’: libavcodec/aarch64/h264dsp_init_aarch64.c:84:38: warning: assignment from incompatible pointer type [enabled by default] c->weight_h264_pixels_tab[0] = ff_weight_h264_pixels_16_neon; ^ libavcodec/aarch64/h264dsp_init_aarch64.c:85:38: warning: assignment from incompatible pointer type [enabled by default] c->weight_h264_pixels_tab[1] = ff_weight_h264_pixels_8_neon; ^ libavcodec/aarch64/h264dsp_init_aarch64.c:86:38: warning: assignment from incompatible pointer type [enabled by default] c->weight_h264_pixels_tab[2] = ff_weight_h264_pixels_4_neon; ^ libavcodec/aarch64/h264dsp_init_aarch64.c:88:40: warning: assignment from incompatible pointer type [enabled by default] c->biweight_h264_pixels_tab[0] = ff_biweight_h264_pixels_16_neon; ^ libavcodec/aarch64/h264dsp_init_aarch64.c:89:40: warning: assignment from incompatible pointer type [enabled by default] c->biweight_h264_pixels_tab[1] = ff_biweight_h264_pixels_8_neon; ^ libavcodec/aarch64/h264dsp_init_aarch64.c:90:40: warning: assignment from incompatible pointer type [enabled by default] c->biweight_h264_pixels_tab[2] = ff_biweight_h264_pixels_4_neon; ^ --- libavcodec/aarch64/h264dsp_init_aarch64.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/aarch64/h264dsp_init_aarch64.c b/libavcodec/aarch64/h264dsp_init_aarch64.c index e0f378f..eb2014e 100644 --- a/libavcodec/aarch64/h264dsp_init_aarch64.c +++ b/libavcodec/aarch64/h264dsp_init_aarch64.c @@ -34,20 +34,20 @@ void ff_h264_v_loop_filter_chroma_neon(uint8_t *pix, int stride, int alpha, void ff_h264_h_loop_filter_chroma_neon(uint8_t *pix, int stride, int alpha, int beta, int8_t *tc0); -void ff_weight_h264_pixels_16_neon(uint8_t *dst, int stride, int height, +void ff_weight_h264_pixels_16_neon(uint8_t *dst, ptrdiff_t stride, int height, int log2_den, int weight, int offset); -void ff_weight_h264_pixels_8_neon(uint8_t *dst, int stride, int height, +void ff_weight_h264_pixels_8_neon(uint8_t *dst, ptrdiff_t stride, int height, int log2_den, int weight, int offset); -void ff_weight_h264_pixels_4_neon(uint8_t *dst, int stride, int height, +void ff_weight_h264_pixels_4_neon(uint8_t *dst, ptrdiff_t stride, int height, int log2_den, int weight, int offset); -void ff_biweight_h264_pixels_16_neon(uint8_t *dst, uint8_t *src, int stride, +void ff_biweight_h264_pixels_16_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride, int height, int log2_den, int weightd, int weights, int offset); -void ff_biweight_h264_pixels_8_neon(uint8_t *dst, uint8_t *src, int stride, +void ff_biweight_h264_pixels_8_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride, int height, int log2_den, int weightd, int weights, int offset); -void ff_biweight_h264_pixels_4_neon(uint8_t *dst, uint8_t *src, int stride, +void ff_biweight_h264_pixels_4_neon(uint8_t *dst, uint8_t *src, ptrdiff_t stride, int height, int log2_den, int weightd, int weights, int offset); -- 1.7.10.4