From patchwork Thu Jul 12 07:16:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiyou Yin X-Patchwork-Id: 9689 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp1347143jad; Thu, 12 Jul 2018 00:16:28 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf7iIesP4jHoX7IVuNWOnxP4Eo6iYXac9ClaU5Je1DVANLbZoq/c8CZs9amKv5PV10l0+1i X-Received: by 2002:adf:e405:: with SMTP id g5-v6mr804903wrm.96.1531379788762; Thu, 12 Jul 2018 00:16:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531379788; cv=none; d=google.com; s=arc-20160816; b=xqJhYeeADe7SQE84EdLIb6x7hbHq8xsjJAr/7i3wxkmt+FyF8txcZbU5FSHuTJcKIt zVqmAGxW3da3DL/muVuiVr//ZS0bWGNv9sTjzq+/lBWi1dhWLT2cv03cV5+yXS3qo1sj drRrbaGYsrN8BCl9+/KVpCl+H2seHDrdHmwu+YRF8ZuCOtu/VLEAtqG5/HeDRj3mpUXi URsDr38DKrHtz8aX6h86pYesqp/PXmVLj2oMI9/Qp8nYVQ/GaikeHFVlhB5z5sgb0ZTo dWW9QLSbk92XCywblFM1VJapnPuPddmSGl9CBFK4Z9CeboktXaQJn9Z4t2BfxqWA1DNr kxqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:delivered-to :arc-authentication-results; bh=QDGoazxZqOLPBGcMbHQ90VRcysGdUsFDvUm08/GasHE=; b=gd1+qO12r6nVLFBB66ITmGN7YWaMUO5mfFoSjrWM4uCkQWP2K0b+/gE9S1N6oo8Jui 3dvTypoonRwLKcCh4eEH7bwcVMgb9xHdwrBBAAyMsb36ckzWg7QxsKiIAEgdS+2daXt7 Jd5JzT7N0n+AhocvZtrxiVPlz0yE8p4QyVcHAt210shQ0lzcalqZn1c0c0d2EOKsYizA 874gYcRM4qwGI+vs7hRkWlkqaq+y9hAh65iIkeqbdsEARgRq3kpOhPHubhDHMMs4qxlt fNemCM2ety77TxsIwdmdLQ92tqpXMIU64LQC65zV6Xvr0xoeBEOe+7u3i127f3GFEoJ6 IhIw== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f42-v6si6967661wrf.336.2018.07.12.00.16.27; Thu, 12 Jul 2018 00:16:28 -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 40AD168A6A3; Thu, 12 Jul 2018 10:16:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5468568A448 for ; Thu, 12 Jul 2018 10:16:09 +0300 (EEST) Received: from localhost (unknown [202.141.160.96]) by mail (Coremail) with SMTP id QMiowPDxv2Mc_0ZbMHKTAA--.28049S3; Thu, 12 Jul 2018 15:11:25 +0800 (CST) From: Shiyou Yin To: ffmpeg-devel@ffmpeg.org Date: Thu, 12 Jul 2018 15:16:14 +0800 Message-Id: <1531379774-32086-1-git-send-email-yinshiyou-hf@loongson.cn> X-Mailer: git-send-email 2.1.0 X-CM-TRANSID: QMiowPDxv2Mc_0ZbMHKTAA--.28049S3 X-Coremail-Antispam: 1UD129KBjvdXoW7Jw17Jry7Aw1UJF4rJF1rXrb_yoWktrbE9r 9Yva48tr4UZan7tF4xGFy5tr4rW343ZF4I9wn8JFnYgFy5XrW7Wa47Ja47Zw4rAr43GayS 93y0qF12qF1IgjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbc8YFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kEwV A0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUCVW8JwA2z4x0Y4vE2Ix0cI8IcVCY1x02 67AKxVW8JVWxJwA2z4x0Y4vEx4A2jsIE14v26r4UJVWxJr1l84ACjcxK6I8E87Iv6xkF7I 0E14v26F4UJVW0owAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG 6I80ewAv7VC0I7IYx2IY67AKxVWUGVWUXwAv7VC2z280aVAFwI0_Gr0_Cr1lOx8S6xCaFV Cjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JM4x0Y48IcxkI7VAKI48G6xCjnVAKz4kxMxkI ecxEwVAFwVW8CwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c 02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_Jr0_ JrylIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr 1lIxAIcVCF04k26cxKx2IYs7xG6rW3Jr0E3s1lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAI cVC2z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxUc4lkUUUUU X-CM-SenderInfo: p1lq2x5l1r3gtki6z05rqj20fqof0/ Subject: [FFmpeg-devel] [PATCH] avcodec/mips: fix conflicting types error of ff_vc1_h_s_overlap_mmi. 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" In commit 975a1a8,function ff_vc1_h_s_overlap_mmi was refactored, but the declaration in libavcodec/mips/vc1dsp_mips.h was unchanged. Change-Id: I90beae683511622a0cc1130ab1660ac8669ec3ef Signed-off-by: Shiyou Yin --- libavcodec/mips/vc1dsp_mips.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mips/vc1dsp_mips.h b/libavcodec/mips/vc1dsp_mips.h index b9b07e1..0db85fa 100644 --- a/libavcodec/mips/vc1dsp_mips.h +++ b/libavcodec/mips/vc1dsp_mips.h @@ -169,7 +169,7 @@ void ff_vc1_inv_trans_8x8_dc_mmi(uint8_t *dest, ptrdiff_t linesize, int16_t *blo void ff_vc1_v_overlap_mmi(uint8_t *src, int stride); void ff_vc1_h_overlap_mmi(uint8_t *src, int stride); void ff_vc1_v_s_overlap_mmi(int16_t *top, int16_t *bottom); -void ff_vc1_h_s_overlap_mmi(int16_t *left, int16_t *right); +void ff_vc1_h_s_overlap_mmi(int16_t *left, int16_t *right, int left_stride, int right_stride, int flags); void ff_vc1_v_loop_filter4_mmi(uint8_t *src, int stride, int pq); void ff_vc1_h_loop_filter4_mmi(uint8_t *src, int stride, int pq);