From patchwork Fri Sep 24 16:37:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30557 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1698697iob; Fri, 24 Sep 2021 09:38:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx+stesd9kd7jrIL8wIdU8oKJ9MAff8R9+XDUAsEkxmdkNiVm6ju4JFO0M8pDJSj4ReZyk4 X-Received: by 2002:a05:6402:2908:: with SMTP id ee8mr6175220edb.33.1632501487914; Fri, 24 Sep 2021 09:38:07 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id my49si9440696ejc.46.2021.09.24.09.38.07; Fri, 24 Sep 2021 09:38:07 -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=@outlook.com header.s=selector1 header.b=VKx4vuB5; arc=fail (body hash mismatch); 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=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68F9E68A769; Fri, 24 Sep 2021 19:37:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-oln040092070100.outbound.protection.outlook.com [40.92.70.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D3CAD6880B5 for ; Fri, 24 Sep 2021 19:37:50 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fw8yfPDs9AkSbKYYVyjIz/FoSPoXXjKSmUGCFBdcD7SYYiN/y4VdVqG9TUlNwaePydmMvGPIMPykLVaPA5DhMsYVxEDClRwej/NurftFdOqoS8UnlHpOoQKWJVkqP1pwbqnfz+T2epYAatoNyDmgIwRXwfPIZNkbUKKh9DgP98HF80DerCOE+TaMpUwqUxOKkz2yKRWcAQyr2nL9PtJ4p3jpTYTvG9QCApx8H75H+PEeutYov6p5wOGWcXGKBL6Itt7UlJj+/Q5M5vW6dvG+ZOV1jtoiwBO5a4L9JHVUY1TzhujX0enmFGMPZh4Bpy78htljyGpK7U6CaUOswFiEBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=ZnUO+YQTA9/VMtYsjGQ/K0JtSvdZ+CPo1u0KXYWUPsU=; b=OA0R29LzHiCAF89s5CH6u1x2sH5nfKroM6Nj7e6Rs9O0f03FJB3EeC752lXOd3gt6t5NKyhRAxa7FOifZnis0BXB+pl0Cj7Vw3/2hWxBi/YXcDK1ezU3VOePL4u3bUxdxBL9sfPt3fl0auaFwzvlKkJEzrT1Lk91wMTepx1jXN+IFXKDN/lAZJPN1m/c1pimtmHvZjITxcR6K2ltTbC83hs0t+y0yhJBUyWOhv/fRg1jhHzDP5uwdEj3TvcyZFRnAzWWnkAlOFCGTUr5l767C0uCCz0VXOoaJqNWbiXlWE2ozHjqVlbKjlXFiUTLF1r/O+nHr8iQTvQ2SqRwfH9xJA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZnUO+YQTA9/VMtYsjGQ/K0JtSvdZ+CPo1u0KXYWUPsU=; b=VKx4vuB5UYh9o5tkYpMECSkz2afdKJOgPpa/YSx+tadD+NwuiVdkPSzvqjMyWyLq1pkE8XRrMHd6Pp+6/FMwgm3aQxplNszpSQFt8cgUqLgE1KTudGOWSDEYer/uYRbfac+n7ScReGAhPkV4TXyOlg9BxyKRWI32iJS8Zml2+PVlHcUiD+/B9Xq93plw+CRM+gB5UHTo6PejFojxZUVyqQXC8Aip4TfeMyGLZ0tvJlaLa/J61KmS5pSKbjqoZXCXROc5aK1dtPTMLHyKb5G6bamS8VJZpevCydoklM5ZiRR925ih6bNmjXoP9PhucdtQhaCEDm3U+3AN+0rw6GC2rw== Received: from PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) by PA4PR03MB6847.eurprd03.prod.outlook.com (2603:10a6:102:eb::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Fri, 24 Sep 2021 16:37:46 +0000 Received: from PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68]) by PR3PR03MB6665.eurprd03.prod.outlook.com ([fe80::15d4:ff2d:e607:cf68%3]) with mapi id 15.20.4544.015; Fri, 24 Sep 2021 16:37:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Sep 2021 18:37:13 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [ediORo33se4Rh5gzHL0HKzN8SznVEgHp] X-ClientProxiedBy: PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) To PR3PR03MB6665.eurprd03.prod.outlook.com (2603:10a6:102:7d::6) X-Microsoft-Original-Message-ID: <20210924163719.562217-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P193CA0044.EURP193.PROD.OUTLOOK.COM (2603:10a6:102:51::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13 via Frontend Transport; Fri, 24 Sep 2021 16:37:46 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f437c09a-9e83-458a-80c5-08d97f79a3d7 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTEQTq7U1k5ffr6GiZbarwOYF1jszu3NdDBQf0oJ3RBLTwotRPT2C2aNobarO+XjQJ+PVVgGrVCitUcn2VH59//uXL+XqI/usjg5+bkkl5CRcaIcNKLfqe3pGpN9BOznvgph6cSmzVUhR05AFw331wYgPB/oVHmexo/KgIxpJjxSDi84BK8wHe8w8+6Cz2hvb9y/OTt+XFHuQne7YLVCoXHUQ+qRho+YxawWgpCvl/LmyLEqNIy4Be9j9fg2bIFbkGoA7XzioIYU6KS5D7Syi+Y70hXjOythPrAYoV3AzwZfZHFDkXnWEsTxp4mlE+zNg7+aZ1HLrS4mDfxJHL15+YYHOP3siziUT6yb56dIQ/9E1rAnxN+pEopnVwujwT9S6Yng185us9oA4QDBXboGdsE8Rq04gnX2Pco6HQVvsh1n4O/Sr1teqcNbDq/pSbbaCLkbGVAWJzxUblcp5RTX2PKz0YPRbouK3ZN584pfKv1Qr0ukwjd1VarUgtDxFX3wH4lvXqMyL83SwS5yFr5sajAkOIquBoXWGlrpLOn9xNO8x3WVf3dY/lJK9jcQExRjTe5m+PDMH+m6tIkIuBTSNaeP+nHZ6ybVJxGwtgJwKF2ZCYlx2UIVrvzQK6T37vmG5LDTPozv43sXsi95+gujCYV2PsMofBckp9nd/6lY80OXIvJSN/itbkkwXeQGchXzG3edfxQjAtKlPH90b3CybMQ42UPQbVmjYg5MrqoNV1w2wlBV10JOZzwuhHK6p8UrBo= X-MS-TrafficTypeDiagnostic: PA4PR03MB6847: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +T5tfOpDDjCVLGu2VqfWl8cox+g7I7M7OdwRrZy4E2+B+6s5DUjvTge3NXi4DCVSAdxW36m3H+/fpho07IKyUm9KPpoI814w4uFmif3+F0RxQRzwwct6kwKhioUjQJe7CSgblJnGsPOxgirwog1ZBwqDHTWnVpfD9JiWy860HmwU0tdHfrH8zoBsdbep30wFhV0dN7oDjkmIC4Y5YDDTM72L8Rx1U73sneUk52BKaYatgSZO+quJKqWIVX+imDMRHQjrwzxQ3Gr6q/ouiOWfeu9o+/SCCSQUmj57bQtKYBweVtAGqeU3hYDEArtsEqfs1BLmow/Wa39T2islOAePyBfFzC9XPkB898yTBpK6b37GY9tI5FzKBILb1VTY1VACqscAEXjNGNhoqHzNKCo+CmzlEByEThiPzIvjRbgEQ/H4jVjFjaI4O4lanLh7A5Y8 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1kBEaHFkF5JPsi2X+ftMCxL7hVMCoDpdKNQGJVHBGzxQ/PjmUWJlBDQlXTeCtQKE2GpdJFU+te9eOKWQYNd4SOsRNq3BbSnEIZFDIP01UMPYWsRm0VVuiQSXq/zv0EEwVmkdZYsobXovq3TBc7iTbw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f437c09a-9e83-458a-80c5-08d97f79a3d7 X-MS-Exchange-CrossTenant-AuthSource: PR3PR03MB6665.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2021 16:37:46.8226 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR03MB6847 Subject: [FFmpeg-devel] [PATCH 05/11] avcodec/j2kenc: Fix AV_OPT_TYPE_CONST offsets 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ns1es1graSr3 They are supposed to be zero. Signed-off-by: Andreas Rheinhardt --- libavcodec/j2kenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/j2kenc.c b/libavcodec/j2kenc.c index 7ebd6856e0..71010509ec 100644 --- a/libavcodec/j2kenc.c +++ b/libavcodec/j2kenc.c @@ -1818,11 +1818,11 @@ static const AVOption options[] = { { "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" }, - { "lrcp", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_LRCP }, 0, 0, VE, "prog" }, - { "rlcp", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RLCP }, 0, 0, VE, "prog" }, - { "rpcl", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RPCL }, 0, 0, VE, "prog" }, - { "pcrl", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_PCRL }, 0, 0, VE, "prog" }, - { "cprl", NULL, OFFSET(prog), AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_CPRL }, 0, 0, VE, "prog" }, + { "lrcp", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_LRCP }, 0, 0, VE, "prog" }, + { "rlcp", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RLCP }, 0, 0, VE, "prog" }, + { "rpcl", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_RPCL }, 0, 0, VE, "prog" }, + { "pcrl", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_PCRL }, 0, 0, VE, "prog" }, + { "cprl", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = JPEG2000_PGOD_CPRL }, 0, 0, VE, "prog" }, { "layer_rates", "Layer Rates", OFFSET(lr_str), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, VE }, { NULL } };