From patchwork Fri Apr 3 18:27:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18615 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3E779449A47 for ; Fri, 3 Apr 2020 21:35:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1ED7A68AEA0; Fri, 3 Apr 2020 21:35:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5FCA36880DC for ; Fri, 3 Apr 2020 21:35:41 +0300 (EEST) Received: by mail-pj1-f68.google.com with SMTP id l36so3363584pjb.3 for ; Fri, 03 Apr 2020 11:35:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=Y7drogDui8c2iaR4AHAYjD9jyc8tUDf3c0gHrpMJzdo=; b=pbMxwjSDfMZ/UKz3EupxmiNB5MbUFuGIa1KxrJ93wi583Ef7CGo/jpJBp23U/7frJY 7Qn6BGRRoYO8VWtN9dgzaGWH25hAnRyxM/GkolU+nIGaL8WcJMB1PDEtM5iVY/5OoXlC Sde0XSkPtjunj4UmGUfRY0i9kMSFEpKHmL9vc2vTasc9BzXdz4C9AJFUub8jvsM7po3s C7FB1V2odpuJQAGVeH+33bVz+5kCutPLp5Gne9WMMqzkPEzhyFaq8BEEnmryR/EjhTEZ bxumIeqk5XaSf+RrEzAzf1R22I8+1vUH4uyYVh/FWMlwR7lgcb6OwW7ax4nJivPrw2wB BDYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Y7drogDui8c2iaR4AHAYjD9jyc8tUDf3c0gHrpMJzdo=; b=sWL0EvLOJd2P8O1gvCyj8iXH5qyxkvzrhN37lyzVGD4zAfJ9Eszd52ihud3Yhpl1sV KM+s5ITPHViIk4x+JD2Qm5shEU068+etj9cTjD13cOg3bbgpkzWM9sI/7cBF+zhKnQ/7 KequaajRxvAVwxIwTw1seWhlMCh73bsGK+nTTjd1o1xaxrnUtMXIOVtqp/SRULWvXqwq FYFTkuQZN4C+i75DkVMgplg2z1pjLjQjQwWzCfKrSv93KaOpwrnWL0WQwjgPKwwdRzzo pCawE4d1WjwcT0aJxuoD6MDFkMUeUn51sMVaJRCm0k/VB9leTDG54FW6J6fOMcCF3NnC 4EDQ== X-Gm-Message-State: AGi0PubSwzYbqshds/9Y5QoMJF4YztNe2PeXqP43alfhvDPjEkH/3uK0 iPSekuEvYBK4AOq75foQnlK6NXz28L4= X-Google-Smtp-Source: APiQypJyI8yGwED041zdet2F8pF6kkNHW8yrij5uMV8/vA0LkDW8pYCXTNPy034aP++cRusoTRJHbA== X-Received: by 2002:a17:902:7809:: with SMTP id p9mr9146831pll.190.1585938485828; Fri, 03 Apr 2020 11:28:05 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id u41sm5865292pgn.8.2020.04.03.11.28.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 11:28:04 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Apr 2020 23:57:56 +0530 Message-Id: <20200403182758.12671-1-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v10 1/3] libavcodec/jpeg2000dec.c: Add support for PPT marker 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 Cc: Gautam Ramakrishnan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gautam Ramakrishnan This patch adds functional changes to support the PPT marker. --- libavcodec/jpeg2000dec.c | 88 ++++++++++++++++++++++++++++++++++++---- 1 file changed, 79 insertions(+), 9 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 7103cd6ceb..02905b9e49 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -83,6 +83,10 @@ typedef struct Jpeg2000Tile { Jpeg2000QuantStyle qntsty[4]; Jpeg2000POC poc; Jpeg2000TilePart tile_part[32]; + uint8_t has_ppt; // whether this tile has a ppt marker + uint8_t *packed_headers; // contains packed headers. Used only along with PPT marker + int packed_headers_size; // size in bytes of the packed headers + GetByteContext packed_headers_stream; // byte context corresponding to packed headers uint16_t tp_idx; // Tile-part index int coord[2][2]; // border coordinates {{x0, x1}, {y0, y1}} } Jpeg2000Tile; @@ -855,6 +859,39 @@ static int get_plt(Jpeg2000DecoderContext *s, int n) return 0; } +static int get_ppt(Jpeg2000DecoderContext *s, int n) +{ + Jpeg2000Tile *tile; + + if (s->curtileno < 0) + return AVERROR_INVALIDDATA; + + tile = &s->tile[s->curtileno]; + if (tile->tp_idx != 0) { + av_log(s->avctx, AV_LOG_ERROR, + "PPT marker can occur only on first tile part of a tile.\n"); + return AVERROR_INVALIDDATA; + } + + tile->has_ppt = 1; // this tile has a ppt marker +/* Zppt = */ bytestream2_get_byte(&s->g); // Zppt is skipped and not used + if (!tile->packed_headers) { + tile->packed_headers = av_malloc_array(n - 3, 1); + memcpy(tile->packed_headers, s->g.buffer, n - 3); + tile->packed_headers_size = n - 3; + } else { + tile->packed_headers = av_realloc_array(tile->packed_headers, + tile->packed_headers_size + n - 3, + 1); + memcpy(tile->packed_headers + tile->packed_headers_size, + s->g.buffer, n - 3); + tile->packed_headers_size += n - 3; + } + bytestream2_skip(&s->g, n - 3); + + return 0; +} + static int init_tile(Jpeg2000DecoderContext *s, int tileno) { int compno; @@ -938,19 +975,23 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, if (layno < rlevel->band[0].prec[precno].decoded_layers) return 0; rlevel->band[0].prec[precno].decoded_layers = layno + 1; - - if (bytestream2_get_bytes_left(&s->g) == 0 && s->bit_index == 8) { - if (*tp_index < FF_ARRAY_ELEMS(tile->tile_part) - 1) { - s->g = tile->tile_part[++(*tp_index)].tpg; + // Select stream to read from + if (tile->has_ppt) { + s->g = tile->packed_headers_stream; + } else { + s->g = tile->tile_part[*tp_index].tpg; + if (bytestream2_get_bytes_left(&s->g) == 0 && s->bit_index == 8) { + if (*tp_index < FF_ARRAY_ELEMS(tile->tile_part) - 1) { + s->g = tile->tile_part[++(*tp_index)].tpg; + } } + if (bytestream2_peek_be32(&s->g) == JPEG2000_SOP_FIXED_BYTES) + bytestream2_skip(&s->g, JPEG2000_SOP_BYTE_LENGTH); } - if (bytestream2_peek_be32(&s->g) == JPEG2000_SOP_FIXED_BYTES) - bytestream2_skip(&s->g, JPEG2000_SOP_BYTE_LENGTH); - if (!(ret = get_bits(s, 1))) { jpeg2000_flush(s); - return 0; + goto skip_data; } else if (ret < 0) return ret; @@ -1056,6 +1097,18 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, av_log(s->avctx, AV_LOG_ERROR, "EPH marker not found. instead %X\n", bytestream2_peek_be32(&s->g)); } + // Save state of stream + if (tile->has_ppt) { + tile->packed_headers_stream = s->g; + s->g = tile->tile_part[*tp_index].tpg; + if (bytestream2_get_bytes_left(&s->g) == 0 && s->bit_index == 8) { + if (*tp_index < FF_ARRAY_ELEMS(tile->tile_part) - 1) { + s->g = tile->tile_part[++(*tp_index)].tpg; + } + } + if (bytestream2_peek_be32(&s->g) == JPEG2000_SOP_FIXED_BYTES) + bytestream2_skip(&s->g, JPEG2000_SOP_BYTE_LENGTH); + } for (bandno = 0; bandno < rlevel->nbands; bandno++) { Jpeg2000Band *band = rlevel->band + bandno; Jpeg2000Prec *prec = band->prec + precno; @@ -1097,6 +1150,15 @@ static int jpeg2000_decode_packet(Jpeg2000DecoderContext *s, Jpeg2000Tile *tile, av_freep(&cblk->lengthinc); } } + // Save state of stream + tile->tile_part[*tp_index].tpg = s->g; + return 0; + +skip_data: + if (tile->has_ppt) + tile->packed_headers_stream = s->g; + else + tile->tile_part[*tp_index].tpg = s->g; return 0; } @@ -1929,6 +1991,11 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) av_log(s->avctx, AV_LOG_ERROR, "Invalid tpend\n"); return AVERROR_INVALIDDATA; } + + if (tile->has_ppt && tile->tp_idx == 0) { + bytestream2_init(&tile->packed_headers_stream, tile->packed_headers, tile->packed_headers_size); + } + bytestream2_init(&tp->tpg, s->g.buffer, tp->tp_end - s->g.buffer); bytestream2_skip(&s->g, tp->tp_end - s->g.buffer); @@ -1991,6 +2058,10 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) // Packet length, tile-part header ret = get_plt(s, len); break; + case JPEG2000_PPT: + // Packed headers, tile-part header + ret = get_ppt(s, len); + break; default: av_log(s->avctx, AV_LOG_ERROR, "unsupported marker 0x%.4"PRIX16" at pos 0x%X\n", @@ -2020,7 +2091,6 @@ static int jpeg2000_read_bitstream_packets(Jpeg2000DecoderContext *s) if ((ret = init_tile(s, tileno)) < 0) return ret; - s->g = tile->tile_part[0].tpg; if ((ret = jpeg2000_decode_packets(s, tile)) < 0) return ret; } From patchwork Fri Apr 3 18:27:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18613 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 80D9B44B191 for ; Fri, 3 Apr 2020 21:28:16 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 641DB68AE7B; Fri, 3 Apr 2020 21:28:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3411E68A477 for ; Fri, 3 Apr 2020 21:28:10 +0300 (EEST) Received: by mail-pl1-f182.google.com with SMTP id ay1so3044476plb.0 for ; Fri, 03 Apr 2020 11:28:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=sQw0W/CnVxnvcidlgaEk71Ku4derDNM3/knZfZqEt+Q=; b=uVTXfilRwGSxZRg3tK6imUK0B/EIbU+W/oxlhztbZX8hj7amAWJuBrm8UZVph6IbMv siPiJ7020mnLh8sAHeAL6XCNCHpghsb/PC1zyers4uQXV899VWwTCobL4KMs39ucSL4a vyEJNdboMVziBj+c80SWLB4X5dRIcX/7wmiSl8LrA8rcIDX54KhU8E94+bw2WoNeC6Fr ciNfJivZAISN7ZccjXgI07tPTnkvZ6CFDHmbTGmzLzxqNPhzhiZ2/+e9y6j6F3MJ7JQd 4c5mpbQXWutnE5OgNnZLCuBR2ssd5tKn8614Act1zQWMgFfNLcgewcdgXUFc/3yJw+3b FPWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sQw0W/CnVxnvcidlgaEk71Ku4derDNM3/knZfZqEt+Q=; b=hOZGUKxJB9xNUIL7XUyJwQ6dsvTxAEh2jZuh1B2y7+f+ZVGZMEWal2niw9dsg+4mnz I1cMmco5NILWIRTlaBdApE9053xC7HnUpqlL92PmKbVSr7oyMGQuYmY+jdoTreTwkmkS JjCWdtqdYTTH5nDm4YG3k8Yr6J1HFKaPph9cvxC9DSorh4YBA48pp5tBgFjKAxZAEUSg 6fAKTP2BGky2OmFe0+LMg9+RHLfjjN9XswVWcHbH1wdQTV1R9l3dB6VDW9HWcqlA6r0T cjWRVdDH9/S8SjlkzXqZSL4/mZ9AWlF2g+zDpuuPp4W067+ccxOOaN4TXssR6Zw729rC 702A== X-Gm-Message-State: AGi0Pua81krK2BAi+9OtW/Ji4/Mm1o9hX1G4QQoZUO+mDET+S8qrRa9y OZdg2neXTyzHYAIe+/GAS3mtSpOl2Ek= X-Google-Smtp-Source: APiQypKPq2V7HqUVUmRkSIrLGBNbFkRo3u7jnfbRK+0PRx4IxFQSa+QvSIGfVAqjcnSMG7kXOr7rqw== X-Received: by 2002:a17:90a:252b:: with SMTP id j40mr11345712pje.189.1585938487761; Fri, 03 Apr 2020 11:28:07 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id u41sm5865292pgn.8.2020.04.03.11.28.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 11:28:07 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Apr 2020 23:57:57 +0530 Message-Id: <20200403182758.12671-2-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200403182758.12671-1-gautamramk@gmail.com> References: <20200403182758.12671-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v10 2/3] libavcodec/jpeg2000dec.c: Handle non EOC streams 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 Cc: Gautam Ramakrishnan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gautam Ramakrishnan This patch allows decoding of j2k streams which do not have an EOC marker. --- libavcodec/jpeg2000dec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 02905b9e49..32a09c6d5c 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2006,8 +2006,12 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) len = bytestream2_get_be16(&s->g); if (len < 2 || bytestream2_get_bytes_left(&s->g) < len - 2) { - av_log(s->avctx, AV_LOG_ERROR, "Invalid len %d left=%d\n", len, bytestream2_get_bytes_left(&s->g)); - return AVERROR_INVALIDDATA; + if (s->avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT) { + av_log(s->avctx, AV_LOG_ERROR, "Invalid len %d left=%d\n", len, bytestream2_get_bytes_left(&s->g)); + return AVERROR_INVALIDDATA; + } + av_log(s->avctx, AV_LOG_WARNING, "Missing EOC Marker.\n"); + break; } switch (marker) { From patchwork Fri Apr 3 18:27:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gautam Ramakrishnan X-Patchwork-Id: 18614 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 91FE544B191 for ; Fri, 3 Apr 2020 21:28:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 75CE068AEB0; Fri, 3 Apr 2020 21:28:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 601F368AEF9 for ; Fri, 3 Apr 2020 21:28:12 +0300 (EEST) Received: by mail-pf1-f182.google.com with SMTP id q3so3879173pff.13 for ; Fri, 03 Apr 2020 11:28:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=iQLmbeVstNc9eZXkWKz7qx0rn53jPknTzGVWQa81zSE=; b=Up0SzmbtT5SfpyMpOWABxonL5QKMKituBtKlKbbNr9q6x4U8PxA/aXnBeKT5JCsT9y XKJU1DYrA68ErHCl5nKGXUIeRPRcwawo5SZ1NfxLTGH4VUnIJEYL+wVt0ZDU8J2E4/3T zb2J8uS+tCsEvvp4jhM3fDI0W0t++BjUTTwTgAe5Y9upUWpuXvld7XZPIFLDIl7ikirF JUQ1PwNCSM8+qro2mTr1zmyAcbuOrbJ1sFTt4ry3bf8qJo+mxrTT71jfBNIXsHqMOVw9 19Ppl94kLpszbBwsCf/uO/8I0TdERz6UfyTfqYEGKy4Ou/jDgIX1Cx7Alh+TlJT3xPdq ClzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=iQLmbeVstNc9eZXkWKz7qx0rn53jPknTzGVWQa81zSE=; b=RCHXrLOuk8R25D43/N7polOctVY5lgxpPlqnF1ZWQzyK0eyBjyGyQjpnuik2/h9ZPY y7bWdgn/YNLXDH02UjSjQBlhwZ0BV0k0DRMIpyR7bsbaU2qSSHHJCpqqfsNj2HuNdhnh FzDLsNmz9o6CGBBVLVpRjK52h8U6oypEaFK4juPHVts1n0tVrY6kainYSdFpAcUGJbb0 9SSWP2T3LucQGLZX8n2fTXtGF1724F1iCf/DLe/a9wFfiDn38MltUxxD9mb6AQYSLucu lUtOiRg3jAGSHHEOhGMgu3Kv5ldFIBZcVWzug71+C6AHPj5H/m2roqKQqiFerfUzFHdb YSww== X-Gm-Message-State: AGi0PuaAC5C70VyPm4Qf0WkgGwP8CpPdCtx6rCJJhEhE7E6D+w+qKT5P IXUP2djTowCLeRQF2HaoaHdofuE1byw= X-Google-Smtp-Source: APiQypKvkghdBton9MwOSZHQv4iN19yVv1Vkbr5OLsb0dWd3D3saZ40r6rg0cvJ7giHPK1Aug5jiEg== X-Received: by 2002:a63:5859:: with SMTP id i25mr9135371pgm.74.1585938489888; Fri, 03 Apr 2020 11:28:09 -0700 (PDT) Received: from localhost.localdomain ([223.235.255.212]) by smtp.gmail.com with ESMTPSA id u41sm5865292pgn.8.2020.04.03.11.28.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Apr 2020 11:28:09 -0700 (PDT) From: gautamramk@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 3 Apr 2020 23:57:58 +0530 Message-Id: <20200403182758.12671-3-gautamramk@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200403182758.12671-1-gautamramk@gmail.com> References: <20200403182758.12671-1-gautamramk@gmail.com> Subject: [FFmpeg-devel] [PATCH v10 3/3] libavcodec/jpeg2000dec.c: Fix indentation 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 Cc: Gautam Ramakrishnan MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Gautam Ramakrishnan --- libavcodec/jpeg2000dec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 32a09c6d5c..36a9e9858a 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -1350,14 +1350,14 @@ static int jpeg2000_decode_packets_po_iteration(Jpeg2000DecoderContext *s, Jpeg2 continue; } - for (layno = 0; layno < LYEpoc; layno++) { - if ((ret = jpeg2000_decode_packet(s, tile, tp_index, - codsty, rlevel, - precno, layno, - qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), - qntsty->nguardbits)) < 0) - return ret; - } + for (layno = 0; layno < LYEpoc; layno++) { + if ((ret = jpeg2000_decode_packet(s, tile, tp_index, + codsty, rlevel, + precno, layno, + qntsty->expn + (reslevelno ? 3 * (reslevelno - 1) + 1 : 0), + qntsty->nguardbits)) < 0) + return ret; + } } } }