From patchwork Thu Nov 30 20:22:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dale Curtis X-Patchwork-Id: 6474 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp312914jah; Thu, 30 Nov 2017 12:23:19 -0800 (PST) X-Google-Smtp-Source: AGs4zMZMcG39rAGL9tBDJzs5H5lI+cNdPVX2mGDkUNR9HDsfnAGJSF45lRw1mqm2tGB96x+5g+BY X-Received: by 10.223.165.89 with SMTP id j25mr3182201wrb.206.1512073398946; Thu, 30 Nov 2017 12:23:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512073398; cv=none; d=google.com; s=arc-20160816; b=apKXfjRRFq7fPN7LoER9edIsvXYc9LuMn760b9TB+iYq68R5e6CX1+dJ7FbDKbkdGU jj+7GpH/Wx1ga5/yNYNtcMQmT9sbes7UsD7Xspb694YHNlcmgQ3Qvmi3/LQTNlHqSUt1 1NgAvf8kCNuwEc+ZAvWsM9yDWS2u27cJKfeMZPeCYwG+wtjSGxhpbOT0x0AjwqOeHlaI 7JbJbCeiDi0VitJDNJb048eUYlklktQMaXV95ZjN757oxI5BUkEOVDplc5YRkif3dBli 5ccpaZbe9GfhtHKX6pItNk1AaNsDLaGArZfvwN0GsfVt5unHexEjf+s4m7WiA6r+lh3K jttQ== 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:dkim-signature :delivered-to:arc-authentication-results; bh=Igz2Zrp9lnTOujgLKhen7+W7zWghl4tC6RBYlDZzarI=; b=UW73bH0cT8JKuurm36zJWVEhHujW7DT64VsCDcpVufbbcdnY5HLalTCuSrV10jw4GE lPwjY1RpBymqL9NWSd4K6K4oMK70xRM50VbjcXuYKwclsueyPHpCvU/O6vTfCxEkVdd4 EKEgF4ow5jPGjBh0woGvNuW6cVw+9trc59C8E0tmFMCvfrwNy11aC0hZdgWpaSrMwFc2 T+I2InUkkxOEH2xkBhxDxQ8qQIojuHIWc3FB9HM26qiNzE0vouWcAndKv4rI4IUW3Uuv rdM875/MwVHUOWOPlyWhGN63ZKpyxxu/eeWiZ5vUDKyTkV9EFntq4L68eiE5KmrcTtE2 69GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=ZyzMqh9r; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=N4KkSivC; 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=chromium.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g20si4031854wrb.374.2017.11.30.12.23.16; Thu, 30 Nov 2017 12:23:18 -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=@google.com header.s=20161025 header.b=ZyzMqh9r; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=N4KkSivC; 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=chromium.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1CFFF68A3B6; Thu, 30 Nov 2017 22:23:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f172.google.com (mail-wr0-f172.google.com [209.85.128.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E9E468A35B for ; Thu, 30 Nov 2017 22:23:05 +0200 (EET) Received: by mail-wr0-f172.google.com with SMTP id q9so7890882wre.7 for ; Thu, 30 Nov 2017 12:23:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:sender:from:date:message-id:subject:to; bh=RLZCiBk0hrlstPdjI/G9yOzU1VGJrBDOGjv4np+qtNI=; b=ZyzMqh9rkl4/SrmKRpyFXk15sQwtsoA2UmXOvkKxKW5AApKod6q6XmYbkPYNjqC3HL nKrFra7VdzC8PrqX42XW5wSMKi3lj5JRRdhN9noG2m/PWIKwxmcFRtIH55skn6PafDYA cEtBSm1Ou3YFtEmqaQR9meA/12D7C8nJyAHv9nIQnxTogS9iHPwhYjDukY/jvH7YjnE2 UTe6p/jaA/ULKOL5mwIplu4p7dMSTtungzLV7mt089gz5ADjuq0x8ezcE7Wz7xvU/Zt2 520pWew3ivJ5pYa4lV15VoPLBU4XqmFAbe1MTZn7MeBdnbQasHPqzCMLEuMHbe7Hc/PN 1XPg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:sender:from:date:message-id:subject:to; bh=RLZCiBk0hrlstPdjI/G9yOzU1VGJrBDOGjv4np+qtNI=; b=N4KkSivCIJJHeCjt/gRd2524FG/eT32xJdk/ziOWX4MXiN7wZKQdCvR90tcUYJCeyB xZXxCU54ns018NRuCIowPkICe50doe5QQ9vwT/OSixXovKmbvkGX7mSoDNyLrsYJvc0w RThNdBS5zjn6BlVvUFDoCqtPdCC2hHX7NdlwM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=RLZCiBk0hrlstPdjI/G9yOzU1VGJrBDOGjv4np+qtNI=; b=k/kGsNfnovrM7mbvVTiK7GjQpTGTTX6zDXSMQSQHr0NEahF4IcKoAFxVEXx9H58sXq 87HelbII91vHjrQ7q9XUGlmtBkZYeKgyYKz0DVxjRf0b3ieV0lEgTIl+RmcPcvU3nXWg rBrpOStTbEbpl5puAWNJ+qrD/6+x1z1A6MC3OqEr3i/2nrp6ly/VpuyqXr9ANViKy+jB ak+Y5sXpQdOYqA9abR6bGrSIsscSqWfFQ2UHXpAOzqhAriJK0UdPH0hSpqlcTLAziiiS LIdwg7EIKEMq5lA4goGrE6W8g4h6qOxA/1S7jKBCLYYMecV0XCJphDdyqYc9ewuQ5aAm 6xcA== X-Gm-Message-State: AJaThX7OeqvvPXFuszt0672TzmJDsZGaQiy6pVddN4VZKO1lktf41mu9 vKfthG6aZCSPqotAN3I3PfHilcQiKAazLWYjx1ytGiG+nqo= X-Received: by 10.223.190.9 with SMTP id n9mr3303990wrh.46.1512073387572; Thu, 30 Nov 2017 12:23:07 -0800 (PST) MIME-Version: 1.0 Received: by 10.28.161.4 with HTTP; Thu, 30 Nov 2017 12:22:46 -0800 (PST) From: Dale Curtis Date: Thu, 30 Nov 2017 12:22:46 -0800 X-Google-Sender-Auth: 9rUlXqdczkh9_b2Ouge_sEEUH4E Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [vorbis] Fix another 1 << 31 > int32_t::max() with 1u. 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" Didn't notice this one when 9648cc6d was landed. Signed-off-by: Dale Curtis From 2f7c0ee007cb28b8f3bf201279d7f17ca671728d Mon Sep 17 00:00:00 2001 From: Dale Curtis Date: Thu, 30 Nov 2017 12:20:36 -0800 Subject: [PATCH] [vorbis] Fix another 1 << 31 > int32_t::max() with 1u. Didn't notice this one when 9648cc6d was landed. Signed-off-by: Dale Curtis --- libavcodec/vorbis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c index 5ccc37a2df..cca2aa7c63 100644 --- a/libavcodec/vorbis.c +++ b/libavcodec/vorbis.c @@ -67,7 +67,7 @@ int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, unsigned num) if (bits[p] > 32) return AVERROR_INVALIDDATA; for (i = 0; i < bits[p]; ++i) - exit_at_level[i+1] = 1 << i; + exit_at_level[i+1] = 1u << i; ++p; -- 2.15.0.531.g2ccb3012c9-goog