From patchwork Mon May 15 10:40:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 3671 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp1406788vsd; Mon, 15 May 2017 03:40:36 -0700 (PDT) X-Received: by 10.223.151.216 with SMTP id t24mr4171996wrb.130.1494844835971; Mon, 15 May 2017 03:40:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1494844835; cv=none; d=google.com; s=arc-20160816; b=mUUt1VHU+bXIXL/5JzhKn4OCrTuckU244ISGBcJf4yLYhu+dAGMieauw0RYP04FzbT eJOhSyFgoY1me+4Sk2r5Ft7UQGgM+Iuu0HU7dEMw92Ia4U7UAJnOGHoCBRnFT+2UqV/s 5a+53kkj425y9gE1r3ri5SAW7bauFqxGRXjmv+4ywkadjX7uUmK7BxrtKyOVM2FGc2Hy pg88w5xclr0NPA4sG6hVclecaGWNSV6JBcxKR9fAHr1I2Phd4S/dD3Kf92rRrsLQBkG+ QN7aO7bOMg2xSQlmNKMTFhjOPe3Wv4Y4jefc5xO4SKJxMQWja0pRfdi6/ktWeCzJRImr H5LA== 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:message-id :mime-version:user-agent:date:to:from:delivered-to :arc-authentication-results; bh=MzDm245TKisNY1H++GRWYKbSqDGcgFrxoqderNPcguE=; b=n5ElxXhx0/EfndR3wa1J5p3Yemch89RnzFWGaWzGndieOI7Qkaw8qOC2BY9QOqpZhP q0AHhYX3W0BnfqLqesjhCMvCfLkJ+TBpb2XvzL1sexwYUZHU4wjy3PYntUUaxwiaAH8h FXCOucj+nW77FWTz3f7pf/vWKHIFwUPsjyV5qzLDqrjj5z62UXYczqtx9tjgTq1PARaO W41rcYdKCN4UmTOcKJcbIy5l5dm7Pc90z9qoT0toKcIdny3qOCtEu5uuMThXx7owd4yh 87HWP18Q7+UB4FM+3xsbui5L8irc8TiO72rvn2OyGIkB9QitBSDvi+chd8d4TsujQw75 uWuA== 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 g7si10436576wmi.129.2017.05.15.03.40.34; Mon, 15 May 2017 03:40:35 -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 4822B689895; Mon, 15 May 2017 13:40:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-3.mx.upcmail.net (vie01a-qmta-pe01-3.mx.upcmail.net [62.179.121.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5CF14689744 for ; Mon, 15 May 2017 13:40:21 +0300 (EEST) Received: from [172.31.218.49] (helo=vie01a-dmta-pe05-1.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dADQT-0005ZK-L2 for ffmpeg-devel@ffmpeg.org; Mon, 15 May 2017 12:40:29 +0200 Received: from [172.31.216.44] (helo=vie01a-pemc-psmtp-pe02) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1dADQS-0005jM-Bz for ffmpeg-devel@ffmpeg.org; Mon, 15 May 2017 12:40:28 +0200 Received: from [192.168.1.3] ([80.110.80.25]) by vie01a-pemc-psmtp-pe02 with SMTP @ mailcloud.upcmail.net id LagQ1v00K0YmCeg01agRzi; Mon, 15 May 2017 12:40:25 +0200 X-SourceIP: 80.110.80.25 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Mon, 15 May 2017 12:40:23 +0200 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201705151240.24007.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]Two patches from github 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 patches have found their way into a github merge request, I will commit them if nobody objects. Carl Eugen From 16ea42a6337db216a605cc211df88eb6bb3dfda8 Mon Sep 17 00:00:00 2001 From: Arnav Gupta Date: Wed, 10 Feb 2016 05:36:59 +0530 Subject: [PATCH 1/2] libavutil: fix old style function definition warnings Change-Id: I879cef5a97542bba4a0923a79b94d044d62fcb7d Signed-off-by: Arnav Gupta --- libavutil/murmur3.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavutil/murmur3.c b/libavutil/murmur3.c index 4271e01..ef853f4 100644 --- a/libavutil/murmur3.c +++ b/libavutil/murmur3.c @@ -60,7 +60,7 @@ static uint64_t inline get_k1(const uint8_t *src) return k; } -static uint64_t inline get_k2(const uint8_t *src) +static inline uint64_t get_k2(const uint8_t *src) { uint64_t k = AV_RL64(src + 8); k *= c2; @@ -69,7 +69,7 @@ static uint64_t inline get_k2(const uint8_t *src) return k; } -static uint64_t inline update_h1(uint64_t k, uint64_t h1, uint64_t h2) +static inline uint64_t update_h1(uint64_t k, uint64_t h1, uint64_t h2) { k ^= h1; k = ROT(k, 27); @@ -79,7 +79,7 @@ static uint64_t inline update_h1(uint64_t k, uint64_t h1, uint64_t h2) return k; } -static uint64_t inline update_h2(uint64_t k, uint64_t h1, uint64_t h2) +static inline uint64_t update_h2(uint64_t k, uint64_t h1, uint64_t h2) { k ^= h2; k = ROT(k, 31);