From patchwork Wed Oct 12 15:09:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vicente Olivert Riera X-Patchwork-Id: 975 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.140.66 with SMTP id o63csp303963vsd; Wed, 12 Oct 2016 08:09:58 -0700 (PDT) X-Received: by 10.194.109.42 with SMTP id hp10mr2206565wjb.24.1476284998177; Wed, 12 Oct 2016 08:09:58 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id xb6si10939100wjb.31.2016.10.12.08.09.57; Wed, 12 Oct 2016 08:09:58 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 229A8689BCF; Wed, 12 Oct 2016 18:09:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailapp01.imgtec.com (mailapp02.imgtec.com [217.156.133.132]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 96D55689BAF for ; Wed, 12 Oct 2016 18:09:48 +0300 (EEST) Received: from HHMAIL03.hh.imgtec.org (unknown [10.44.0.21]) by Forcepoint Email with ESMTPS id 08E149876B825 for ; Wed, 12 Oct 2016 16:09:44 +0100 (IST) Received: from HHMAIL01.hh.imgtec.org (10.100.10.19) by HHMAIL03.hh.imgtec.org (10.44.0.21) with Microsoft SMTP Server (TLS) id 14.3.294.0; Wed, 12 Oct 2016 16:09:47 +0100 Received: from vriera-linux.le.imgtec.org (192.168.154.36) by HHMAIL01.hh.imgtec.org (10.100.10.21) with Microsoft SMTP Server (TLS) id 14.3.294.0; Wed, 12 Oct 2016 16:09:46 +0100 From: Vicente Olivert Riera To: Date: Wed, 12 Oct 2016 16:09:40 +0100 Message-ID: <20161012150940.27356-1-Vincent.Riera@imgtec.com> X-Mailer: git-send-email 2.10.0 MIME-Version: 1.0 X-Originating-IP: [192.168.154.36] Subject: [FFmpeg-devel] [PATCH] libavcodec/mips/h264dsp_msa.c: fix type in some function parameters 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 Cc: Vicente Olivert Riera Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This fixes a build problem for MIPS architecture that looks like this: libavcodec/mips/h264dsp_msa.c:2498:6: error: conflicting types for ‘ff_weight_h264_pixels16_8_msa’ void ff_weight_h264_pixels16_8_msa(uint8_t *src, int stride, This bug was introduced by commit bc26fe89275c267d169b468356c82ee59874407d: avcodec/h264: Use ptrdiff_t for (bi)weight functions That commit changed the data type of some function parameters in some function definitions. However, the implementation of those functions in libavcodec/mips/h264dsp_msa.c wasn't changed accordingly. Signed-off-by: Vicente Olivert Riera --- libavcodec/mips/h264dsp_msa.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/mips/h264dsp_msa.c b/libavcodec/mips/h264dsp_msa.c index fce01ac..16e4858 100644 --- a/libavcodec/mips/h264dsp_msa.c +++ b/libavcodec/mips/h264dsp_msa.c @@ -2495,21 +2495,21 @@ void ff_h264_h_loop_filter_luma_mbaff_intra_msa(uint8_t *src, avc_h_loop_filter_luma_mbaff_intra_msa(src, ystride, alpha, beta); } -void ff_weight_h264_pixels16_8_msa(uint8_t *src, int stride, +void ff_weight_h264_pixels16_8_msa(uint8_t *src, ptrdiff_t stride, int height, int log2_denom, int weight_src, int offset) { avc_wgt_16width_msa(src, stride, height, log2_denom, weight_src, offset); } -void ff_weight_h264_pixels8_8_msa(uint8_t *src, int stride, +void ff_weight_h264_pixels8_8_msa(uint8_t *src, ptrdiff_t stride, int height, int log2_denom, int weight_src, int offset) { avc_wgt_8width_msa(src, stride, height, log2_denom, weight_src, offset); } -void ff_weight_h264_pixels4_8_msa(uint8_t *src, int stride, +void ff_weight_h264_pixels4_8_msa(uint8_t *src, ptrdiff_t stride, int height, int log2_denom, int weight_src, int offset) { @@ -2517,7 +2517,7 @@ void ff_weight_h264_pixels4_8_msa(uint8_t *src, int stride, } void ff_biweight_h264_pixels16_8_msa(uint8_t *dst, uint8_t *src, - int stride, int height, + ptrdiff_t stride, int height, int log2_denom, int weight_dst, int weight_src, int offset) { @@ -2526,7 +2526,7 @@ void ff_biweight_h264_pixels16_8_msa(uint8_t *dst, uint8_t *src, } void ff_biweight_h264_pixels8_8_msa(uint8_t *dst, uint8_t *src, - int stride, int height, + ptrdiff_t stride, int height, int log2_denom, int weight_dst, int weight_src, int offset) { @@ -2535,7 +2535,7 @@ void ff_biweight_h264_pixels8_8_msa(uint8_t *dst, uint8_t *src, } void ff_biweight_h264_pixels4_8_msa(uint8_t *dst, uint8_t *src, - int stride, int height, + ptrdiff_t stride, int height, int log2_denom, int weight_dst, int weight_src, int offset) {