From patchwork Fri Mar 24 22:10:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40813 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4c12:b0:dd:c6d8:789a with SMTP id fm18csp797209pzb; Fri, 24 Mar 2023 15:11:09 -0700 (PDT) X-Google-Smtp-Source: AKy350a6RskA4nI6LlJuD4jK+F8kbkJW3qEdxW+nVHluT4Qco5+6rw6zCmHRTFp2YQprMr9oHs4X X-Received: by 2002:a17:906:9453:b0:932:b7ce:2aaa with SMTP id z19-20020a170906945300b00932b7ce2aaamr5111213ejx.28.1679695869255; Fri, 24 Mar 2023 15:11:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679695869; cv=none; d=google.com; s=arc-20160816; b=Rq/9Je+Bf/H/iD37Yr8FCjJVXg9iE7Au16tll0j9txcqCYSeQ10EikacetDqus0C+/ h5gszfnLFkt1BNrj4hj3L8+J7OmOVVo7gpVYhSZLCqQBpt9QTmp0LtDjpZ5zdBkI17Mc JBFybDmsdx3pMkiw3BBDcYJJ2bwjWdyDsuNUcSKGJ5w23n5wRAE160JtbfjOHqfLtcUj B72EBvt4et2bRC+4Zaxcvh/b6Ymy5Rh+NIv2fQlcWaOZLpp3CRunyxEWHMcYsgnggQyU 7TCdJ8HdtxBUJSH03tgv1KSwUSVF5Njpdm2TFT+Xon0a+kqNMsMVxjBUJGIplf6Yhtqr Luzw== 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:delivered-to; bh=4FcvKeYQV9FMPpXBA3mZK3Dow2NjBqh32Rpx9JuGqSU=; b=AXy7by9eKNC///bcIAekTWghBQXmQnFnqoJxGVbHfxI7RbY2+OBgqRrEg7Pz8P6384 RJxt6GPLLSRACDj8DxHDzH+3aNvR82U7knS7KJ3LuJojWocRAgpnzVAwYGDvtaEav8ea 0RyU9FAJ1TIbXs8sOQHMagePkkry9FGTHVZKZH5jcb72s+OxiGA8zmu8QLBAgg8agwru P9mvtICJmd6qPB3jmgsCLKkGKZa18YEvX9W1of8eF+IxugGMC5N6Plyu2TVeZ0u87Iw1 L741bgOFvhTsuutsY24pTY/rfbECkAx9Dl0vKK/fzV9QbqOAjsFupdRv7c7oiJf3Z5xX CPVA== 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 gl14-20020a170906e0ce00b009324539297csi15500384ejb.208.2023.03.24.15.10.47; Fri, 24 Mar 2023 15:11:09 -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 F30DB68C8E0; Sat, 25 Mar 2023 00:10:34 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay10.mail.gandi.net (relay10.mail.gandi.net [217.70.178.230]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7F61368C249 for ; Sat, 25 Mar 2023 00:10:28 +0200 (EET) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id A763B240002 for ; Fri, 24 Mar 2023 22:10:27 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Fri, 24 Mar 2023 23:10:25 +0100 Message-Id: <20230324221025.19447-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230324221025.19447-1-michael@niedermayer.cc> References: <20230324221025.19447-1-michael@niedermayer.cc> Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/snowdec: support DWT with new size rounding X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: TMScIOcegF1h Signed-off-by: Michael Niedermayer --- libavcodec/snowdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index bed29d3390..b7a5864f4c 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -385,7 +385,7 @@ static int decode_header(SnowContext *s){ } s->spatial_decomposition_type+= (unsigned)get_symbol(&s->c, s->header_state, 1); - if(s->spatial_decomposition_type > 1U){ + if((s->spatial_decomposition_type & (~4)) > 1U){ av_log(s->avctx, AV_LOG_ERROR, "spatial_decomposition_type %d not supported\n", s->spatial_decomposition_type); return AVERROR_INVALIDDATA; }