From patchwork Tue Oct 17 21:12:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 5604 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp632401jah; Tue, 17 Oct 2017 14:13:20 -0700 (PDT) X-Received: by 10.223.163.92 with SMTP id d28mr5020182wrb.281.1508274800781; Tue, 17 Oct 2017 14:13:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508274800; cv=none; d=google.com; s=arc-20160816; b=ji3pju3z1owl8zctd6cDKiAGboPdcexet2W08BnMJ0EksmCcMwIksk3CYX/JN/H6HC 1SiJdRDxHLlhvh3MxzZWVjQocq/y8PQPT2FV2hMdV7XgFIHkRMxWGkTtaz4RHsfNG2IT nyNF+efdmh4Dw+rsLYzgebHOSnkCbD52z/UenQM06sL3vMA3Ua4M1LZqVl8ELpn3Bo4+ gUFkj0i3L/3JXLixl0b/kCG7geDC6Jg9cybQ2Mh+vgigoDlO50Z33sbLJnuire7dQ/Q4 zDS7TFcuJMTNYRY0Ukw8fKrTn8T4BErzFbUGdXrobWjsuNMRoaHI+0wc+JWRgwy2oVrK ZiZQ== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=jRivrJrmEqIN3e1PLa4T75pASbMJGhf2R1w7FLLtW54=; b=WBrB7jaTqe3V2tncJueg8jjGLNuG6LYwfWyjeRgxlifKdZhGFLuGqTkbbgfMEY+Fbu LU6j9nfwWv00jDjDqsqpBRy8Fo8vkkGko6EOH3fEvKC0k2H2ow1Ezht2zdCusmYXCFn2 Npj2v152epVKJGphqDLwwXZLfDYp+lEujwEnirzcEcQl+d0Av4V0et3QzSlVMq4lRrqY mS2k+4mVr69RLB1nqIwFdkv1GzoI21WjmnsUZA5xhktjHhV0OjBj6DIgdh6UqvaKmEfu zKEVXYw+c7etCRmguCc0NNZEVpOjTpJiyZ/mqvr6WSHlttULjEWZvwEGqPXrwXTOpzDZ YEEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=w05WRmev; 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 e130si8213426wmf.1.2017.10.17.14.13.20; Tue, 17 Oct 2017 14:13:20 -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; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=w05WRmev; 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 BAB8868A077; Wed, 18 Oct 2017 00:12:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f50.google.com (mail-wm0-f50.google.com [74.125.82.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68DFE68A059 for ; Wed, 18 Oct 2017 00:12:32 +0300 (EEST) Received: by mail-wm0-f50.google.com with SMTP id f4so6458809wme.0 for ; Tue, 17 Oct 2017 14:12:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=KhC4xewP2+9tgsFsi5OxZPh4zjXRxfl4zE04AHDyZ04=; b=w05WRmevd6lhDWgAvWvGNr+Ee2ZofGA65qzWHOJbVSl31N8uDEPJ7elt2yC1XOblOj hSVEK3J22HfHZfkQWfIAyz7TCZstkQ05RAu6rg8bmCIrgTq2qEqvlR4BL/IjQlzj9Mgf sCxfYjxNRJZZt3/8ydo3z1VjoYq7LwjUr/XprKzfWL47tCI7OouokQv34Qvirc/d1/hE YONmHzgoYc1wRxZBm19smTttbio0dZKGSDEFHoQ7xU1UPMdoaNM8xxtOhSNziUle6xL6 pxP4ZjRcMpAuEObcPALBOmLATo90ufqzwxwoec/jTQ/XMIQmuzZh1uuocqdoaoUcuwwL vhnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=KhC4xewP2+9tgsFsi5OxZPh4zjXRxfl4zE04AHDyZ04=; b=eqDi1YAVGN/isWOE5KMRxwv165cNMveFy2kh4MXPHoUWqJ9ojSu7ZidYFM5iCLLqds Hl6XARhTCXI0XGxWhHv00xO7Mwy1byIy10IxsQcgbZCIF8CpwIlyq8NuXCoP9ygeuJe5 0/5KMIEk6guodb/a/9GndHH4sE5UQJOcsSh3lJ6Ap9onowfVT2Umm9LG3atFqfz2Drf+ 0X7AUb9tbTuDnSxEbFMvGqrcdNWOdArmWIJ1FiRxAO6WLN7ILLJuZ31Q4n4ftvGg+LuQ 049cYPl2fh6mu5E+Oq1Fgfj3zG/GuBKJ+XBQSX3/mjjhOUHq0G99vEbS1xX44ujKpKqF eh9Q== X-Gm-Message-State: AMCzsaWD90GkfTXKdvTQI3naimtzYzXa/bjJyPYQ9EvigUeu4iQI5DrM tCRA33kNLgcwk+0MZKnkQAZcgo0U X-Google-Smtp-Source: ABhQp+TxsPCTHcQq78MxSJZf/Ml82h0noc7s5Y2EdAhXCZa6OGjVT7pdrPWccKrlwUAzxAFnv23B3A== X-Received: by 10.28.193.76 with SMTP id r73mr4381268wmf.18.1508274756677; Tue, 17 Oct 2017 14:12:36 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id m25sm10810335wmi.7.2017.10.17.14.12.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Oct 2017 14:12:36 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 17 Oct 2017 22:12:24 +0100 Message-Id: <20171017211225.3175-8-sw@jkqxz.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171017211225.3175-1-sw@jkqxz.net> References: <20171017211225.3175-1-sw@jkqxz.net> Subject: [FFmpeg-devel] [PATCH 8/9] cinepakenc: Move declaration out of for initialisation statement 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" (cherry picked from commit 92f0aceb36c6e4412d4cf346e70dc74b5a4069e9) --- libavcodec/cinepakenc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/cinepakenc.c b/libavcodec/cinepakenc.c index a28f669070..330c8827d1 100644 --- a/libavcodec/cinepakenc.c +++ b/libavcodec/cinepakenc.c @@ -994,8 +994,9 @@ static int rd_strip(CinepakEncContext *s, int y, int h, int keyframe, #define SMALLEST_CODEBOOK 1 for(v1enough = 0, v1_size = SMALLEST_CODEBOOK; v1_size <= CODEBOOK_MAX && !v1enough; v1_size <<= 2) { for(v4enough = 0, v4_size = 0; v4_size <= v1_size && !v4enough; v4_size = v4_size ? v4_size << 2 : v1_size >= SMALLEST_CODEBOOK << 2 ? v1_size >> 2 : SMALLEST_CODEBOOK) { + CinepakMode mode; //try all modes - for(CinepakMode mode = 0; mode < MODE_COUNT; mode++) { + for(mode = 0; mode < MODE_COUNT; mode++) { //don't allow MODE_MC in intra frames if(keyframe && mode == MODE_MC) continue;