From patchwork Thu Jan 18 22:34:41 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: 7334 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp80404jak; Thu, 18 Jan 2018 14:35:13 -0800 (PST) X-Google-Smtp-Source: ACJfBosbmuHGbAKfzAt3mZAp7fVTP3S6Cem9LfSu9/rKi/FrYuUunoMHZRj0F+iDJBP1ON8YOPNa X-Received: by 10.223.160.120 with SMTP id l53mr7246246wrl.59.1516314913858; Thu, 18 Jan 2018 14:35:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516314913; cv=none; d=google.com; s=arc-20160816; b=BtBJlFUrXSQjdwfwyobecxUH0mnPv33N6NvMZtFinNeri2y50HO7HQZhF5pKQ1YYFS tAOgE46IB7UhHgYjBXnIHB+CHNNJx1IJ6Juhse6+6S7SVkUIxDCHLLkvRGW93XhTSDiH qTkBwj9rJxsMlSOX7aQn+E4yEjy1IFan0ya/njevP9/P++Xb3XKf7KsPOz9Eqj77QCMk Z8l9TXj4CrXVS1e4jIUBZx1wVPEAt2up3zVCbkiiJoyBe7YsEvdjr/IVWDezBR+m/pZF LGt3rtDDVLUrnOFWFjWPCCI5M5/cSQbQxnEQcXxJukS//4MJl6PjyDoCB28ub0vZQSqu DieA== 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=RyGy2+mLaSYGeEw6J+4G6VDN8n0vGvDrmXAYiC/INl0=; b=KBddjwuFfr1GzBdE0Em+sixE8Y87qwnO7ZM+8kYOaVcDfjYFiZ+fjFLbQzEqn3R0Ih 2yLpu8dXBVdDJ3HLbBzHUB4sikNUi0RFKfEJfIlpttMQg0nbX6+/MQIpQ2QGF95ZhkME bD9zvX4RbMtwBsd1uSFjS55lX45WB/hvlqPH+z7/OwZ3uIhAVgDYF8NCOEkCAJQWYTQp RubkRNbU98RGQiv2CKT4b5jaM/zM1CKlJW0G0YkL/xsXpOtlt+TMCZfintuX4Afou+0N 2l4nJidzS+nzmF+EHcW6FKAs83/Stp5gP2KHvACBkeZPaN+cFRgq4px/K+ypw0KYtOyd 2h4Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=n/VqHxzU; 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 q20si5889420wrf.421.2018.01.18.14.35.10; Thu, 18 Jan 2018 14:35:13 -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=n/VqHxzU; 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 5E81668A2DB; Fri, 19 Jan 2018 00:35:09 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-it0-f48.google.com (mail-it0-f48.google.com [209.85.214.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9FF268A261 for ; Fri, 19 Jan 2018 00:35:02 +0200 (EET) Received: by mail-it0-f48.google.com with SMTP id p124so145693ite.1 for ; Thu, 18 Jan 2018 14:35:03 -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=fFLGM01p2ADlyKiV23YGZxfi0n//657pBsxdVJ9FObA=; b=n/VqHxzU9vux/Ez+JclEe48tO0S91lUHpyElkgMTK5MJ/VXEMpdutmRSctVOlgmSZe +zSXLiWsHOXhc08kcBbp4hWtIF7ui3HN0uK7ByJ3Z337MOdypAOyITXhExPywFcYzqAl z2wLHFmGaoewGti7GI500ox50eYcgE6NjX+lkB0/Hv4vgAUM/NCBf9IzZPxZGDgzFS3A x108f7z6ciodEofcHOXmFhjqkQrOMn7/ZYnodQ8ndkXWX8NHkufEHyO3qGfKqjd0IgLw N7lV2q8G/RUOJdHWzqrKXYmvtlt52g2Rd0RTbmAcLMen+ciQ2tAe+9+nY+8iFoC7GOMP RNGA== 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=fFLGM01p2ADlyKiV23YGZxfi0n//657pBsxdVJ9FObA=; b=GMN1QJq9eOsebNy1QbsXIIOu8N1pJcFsbPujOs5jYbiA+B5r7nZlKd/5f66AC713Ph k+bjqtvarmUiJ1bn7r4Iwjs86s1ctQAlx7hDti3j0OzWjygJ/WrV5uJmySww6ndXFgp7 XV1rv8m4ZjZfgzFRR7xgjXVlCThH0rBsiv7Glf6MZGXYjDMeDmqCMmbAPA/I732twRUe AUIdG02GPD9qqBYxHGGLPX79eVSheoUp4RmO4YB0eKRnJKCykK25NW52eaEIh9pImaqg sUxCOhZP/2XTpCWpSOIPtLM2HOHJkWSVpkF5YGIO3QmPy/MFeNGXz8tjvXa15IeLwlNs Dvtg== X-Gm-Message-State: AKwxytf+hSH27NEMdKPNNJhcbC8t8mkXl3CKhoHex93VlYC+gEQ1ghAh +fD90HSe8K+aq6loW2/+oVfHAglLnljYf70hO/A= X-Received: by 10.36.33.66 with SMTP id e63mr22414519ita.74.1516314901897; Thu, 18 Jan 2018 14:35:01 -0800 (PST) MIME-Version: 1.0 Received: by 10.2.89.16 with HTTP; Thu, 18 Jan 2018 14:34:41 -0800 (PST) From: Carl Eugen Hoyos Date: Thu, 18 Jan 2018 23:34:41 +0100 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH]lavc/svq3: Do not write into const memory 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, I suspect it makes the code more correct. Please comment, Carl Eugen From 0460da037b91bbc4d0fbca3b756f5c7d345bbbbc Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Thu, 18 Jan 2018 23:31:48 +0100 Subject: [PATCH] lavc/svq3: Do not write into memory defined as const. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes a warning on ppc: libavcodec/svq3.c:1055:21: warning: passing argument 1 of ‘av_write_bswap32’ discards 'const' qualifier from pointer target type --- libavcodec/svq3.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index a937b2f..fc17081 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -1048,12 +1048,12 @@ static int svq3_decode_slice_header(AVCodecContext *avctx) } memcpy(s->slice_buf, s->gb.buffer + s->gb.index / 8, slice_bytes); - init_get_bits(&s->gb_slice, s->slice_buf, slice_bits); - if (s->watermark_key) { - uint32_t header = AV_RL32(&s->gb_slice.buffer[1]); - AV_WL32(&s->gb_slice.buffer[1], header ^ s->watermark_key); + uint32_t header = AV_RL32(&s->slice_buf[1]); + AV_WL32(&s->slice_buf[1], header ^ s->watermark_key); } + init_get_bits(&s->gb_slice, s->slice_buf, slice_bits); + if (length > 0) { memmove(s->slice_buf, &s->slice_buf[slice_length], length - 1); } -- 1.7.10.4