From patchwork Thu Mar 30 18:00:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 40923 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp119723pzb; Thu, 30 Mar 2023 11:01:20 -0700 (PDT) X-Google-Smtp-Source: AKy350YWJfj4q3/EVfkgEYFLav+lALwfaNTuvbB1eYO/d3ar1HF5pIVwMObmvPKXy4hkyeP5pmur X-Received: by 2002:a17:906:9b8b:b0:947:335f:59f9 with SMTP id dd11-20020a1709069b8b00b00947335f59f9mr5406910ejc.69.1680199280523; Thu, 30 Mar 2023 11:01:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680199280; cv=none; d=google.com; s=arc-20160816; b=uXl7Jb4kf6AOVy/Qlm3nDTWSOXBYPEIGcRLqy0/6tCLxKla3o/i2xvrJnU5V2Z8Fu8 sAJ3C4J0GmZEG8p4BaxbYOARqBwJLKzZRbEY+OEde4K74Ecq0ZbBMWJloOxV4D7eBPNO CS/qah15X+44akshy+AScEysZNE0WS3OLKdstPYgpkGbnvRl+2V+HYp5VtuiXAAlbRSD 3o/jyBfaxGv9G4WVQvdzWNS1NQpQsU8UDFL4u+YZqjvqPJVn7wGSY/+EoCuXKUlZENTZ xpBNgPIbnoFMmIpGITDQeppQd3bHNOkfXz309lUDq8HRNi4xB4C3gXZnEU6SZyBetHGi n3pA== 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:message-id:date:to:from:delivered-to; bh=EkEmYKygBt323kkCoa+hOCkCh3hwpp58DVXx7YDxAaI=; b=ZClaWE/y69EHa1garCt3VqozDprm8gx+gib3WrvYcETeiqPhVWNhGLKJ0jGut58HZE CYHJJg17hgVfz6PcPZh2KFOZC0M45fT+REBZZRQhLl7JxRm2tkYtxmESqpOipgFUlcye seq54qmtdMMefXpyxAgimGQGL0SgCMHA2KXLavktgb25AgfSftF9CVONvA6TvBz14Fed iipR/tsYhM8eL8WmeTTacrJssFQr/D/LLw0J+evugQHFrRZ79wnkeWA843M6KSAgrAe2 AtCTWZ81cRS4lnueHn+CW62IBjgnTCNvZH2fghwB1vLSWwgfh4G6SODPliu0o1IlYP/p xymQ== 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 r10-20020aa7cfca000000b004a18f2ffb81si284582edy.321.2023.03.30.11.01.20; Thu, 30 Mar 2023 11:01: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; 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 289CA68C381; Thu, 30 Mar 2023 21:01:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26B9C68C2A3 for ; Thu, 30 Mar 2023 21:01:11 +0300 (EEST) Received: (Authenticated sender: michael@niedermayer.cc) by mail.gandi.net (Postfix) with ESMTPSA id 9E3B71C0002 for ; Thu, 30 Mar 2023 18:01:09 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Thu, 30 Mar 2023 20:00:56 +0200 Message-Id: <20230330180106.11275-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 01/11] avcodec/j2kenc: fix 5/3 DWT identifer 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: bkXoUKZ7iagU Signed-off-by: Michael Niedermayer --- libavcodec/j2kenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 6406f90ac2c..821967f9e43 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1810,7 +1810,7 @@ static const AVOption options[] = { { "tile_height", "Tile Height", OFFSET(tile_height), AV_OPT_TYPE_INT, { .i64 = 256 }, 1, 1<<30, VE, }, { "pred", "DWT Type", OFFSET(pred), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE, "pred" }, { "dwt97int", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "pred" }, - { "dwt53", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, INT_MIN, INT_MAX, VE, "pred" }, + { "dwt53", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, INT_MIN, INT_MAX, VE, "pred" }, { "sop", "SOP marker", OFFSET(sop), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE, }, { "eph", "EPH marker", OFFSET(eph), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE, }, { "prog", "Progression Order", OFFSET(prog), AV_OPT_TYPE_INT, { .i64 = 0 }, JPEG2000_PGOD_LRCP, JPEG2000_PGOD_CPRL, VE, "prog" },