From patchwork Sun Jun 4 02:02:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41968 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp2235287pzb; Sat, 3 Jun 2023 19:02:36 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4LzbQbF6eAbRTdU5K/+l6wFIwLBjAPsWmPH4xBQyUHOvLfo/sfBbvBaU/N3XGA+0D4dmsV X-Received: by 2002:a17:907:72c4:b0:965:ffda:b9d2 with SMTP id du4-20020a17090772c400b00965ffdab9d2mr2992900ejc.11.1685844156049; Sat, 03 Jun 2023 19:02:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685844156; cv=none; d=google.com; s=arc-20160816; b=JlkzU7aQhhAvH6vqCZHEO4Tzs3R6Za3B/qHQ1TdlVgfQNmvVhOGebY36WOM6PTdRHD ZZLCPoicBb3E5vE87TReMpkg+GCkVx75j5O6SoNyPcA3Mc+DJje6Bhm3c6inBx5YR2e0 n18htz47DN+lHYGUe7pkwH0N+NKpamo/Z6mD8LSyscDYr4isV/KifF9RL5OdXHz76ye0 uIfJkRB/Fxg0gp7hvHFdZt8MJRRxYXKqlZlV/jcJb54GjDugFfss73wae+WAj/NzOXkG So7X11ejOEAcOkAEwYIyZu7jF8wQNMU81PLS9Av4IEheqv5dUPQwm+LPPkS2urVVsCHD Fq3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=6rRhCHptp9zQyBveNc8bu6dxVeItmrUrweVFeOBbGBE=; b=xgmtl7OGq/GfFy0VuiUbd81atDkm85ZZ0x7yLlSn/s9nqHF88PA1vMzoBh/AFSXx6Y 1C0paaTfYGiqFFE/3mdCcdpgO3yMmGdzLhdRLdHO5GuOYCagNyrna+G0NRoXbMhvyHqz Z4cNmNz0GTNzjPLd0bd3RM4T+ykRCbc09chpRy+YWiUKst0xW11f1WPy+EY/X2H0auoy LtWc8/gBW5WHXexhnMz3CrMrKZO4D5wchBBIJreNldVr8GHUdJEqxXCqgAmiOuYZaxQ0 ahijPE7Yg/3qJ4WwINTHq8GoDTSPWz5HtC0eB8VC/V48P1WkanS7nDmr32f5QOtql7LB 0sHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=UKMB9I4o; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gl7-20020a170906e0c700b009745723f111si3066568ejb.648.2023.06.03.19.02.34; Sat, 03 Jun 2023 19:02:36 -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=@gmail.com header.s=20221208 header.b=UKMB9I4o; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C94B568BEBD; Sun, 4 Jun 2023 05:02:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f50.google.com (mail-oo1-f50.google.com [209.85.161.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B5A368BF99 for ; Sun, 4 Jun 2023 05:02:24 +0300 (EEST) Received: by mail-oo1-f50.google.com with SMTP id 006d021491bc7-55564892accso2513263eaf.2 for ; Sat, 03 Jun 2023 19:02:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685844142; x=1688436142; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=vEssEWyR9gPK30SkRL5SdBqdcJFfemRI/tiVwJ46kzM=; b=UKMB9I4obNn4QTtFaOXCu27uYUWJrE8OnnwwxThhvUccNNFP1gaC8nkKULU3ji/Ckf foR8gAZA/ROfXycb46UZ8WLuyrTmtSSzX5cBfv8LwNDSDzxKavf7MSWl08NsKMrMjmVg djpjoDynpavIcVWNx5JF9hoyBZ4VXpy7x84d7Mwe+S9ZIGmVKSr98a7ww28OvoXnF1CJ jJ7K/J9NZ5yqN0zjTp0E76th7WsHdjk14fYOGHRTX67/VrVGx7Ai27fPYiJe+1ec2MnH SnkPYBnjPcSTfoGBHyj8IjTh68WxeE96JrrL/vf3d9LogG8uf9Hdw95iA/2ZO0MhDfiH 1llQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685844142; x=1688436142; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vEssEWyR9gPK30SkRL5SdBqdcJFfemRI/tiVwJ46kzM=; b=PMSCHk/9X9SyNIiDvI6cYsb84Wzq5h2pin0AMvAI3Q5DO2VABxVAZfjDs4PwrHPpMi jpQbHWvYnNJ3bhmCY8CIjNgGUU2b7dtdpad92/GEbQVA48QDVL3/+Bk/9RFVYxU86jOH 1BqVv6KMp/7WIOwaznwo02/KDdBT77KMbb06fSgfTyw3YK3o71Za7CisiGAuFdzjvFDB wBSKjVaz4UqO8YsbZa9TvSaiu4BZjlQ3HQt4s49r/jv3aDGFOnyngkT6PUyiMZ2TtfYv sAfg7D992XItzxZ9JRSQpNTaOuVLclAWjLr/osXM5OY1FIDt5B49v3cRp+gOpXWPWqdv 9ldQ== X-Gm-Message-State: AC+VfDz3HrDc/uuewQ+lrc90Se2Z9NCaKCJCoezCdv6XoU8rn2AbfOu3 hToSnmyzChQfNrqbIg0N04KXRqTuFdg= X-Received: by 2002:a4a:4f46:0:b0:555:7d66:552e with SMTP id c67-20020a4a4f46000000b005557d66552emr10834274oob.2.1685844142224; Sat, 03 Jun 2023 19:02:22 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id x1-20020a4ad041000000b0054f6fb0ec57sm1930570oor.11.2023.06.03.19.02.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jun 2023 19:02:21 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Jun 2023 23:02:12 -0300 Message-Id: <20230604020214.1527-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3 v2] avformat/av1dec: fix EOF check in Annex-B demuxer 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: H2XXinMu60Zo And return any packet buffered by the bsf. Signed-off-by: James Almer --- libavformat/av1dec.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index 216d4e2298..79ad8a9411 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -124,13 +124,17 @@ static const AVClass av1_demuxer_class = { #if CONFIG_AV1_DEMUXER -static int leb(AVIOContext *pb, uint32_t *len) { +static int leb(AVIOContext *pb, uint32_t *len, int eof) { int more, i = 0; uint8_t byte; *len = 0; do { unsigned bits; byte = avio_r8(pb); + if (pb->error) + return pb->error; + if (pb->eof_reached) + return (eof && !i) ? AVERROR_EOF : AVERROR(EIO); more = byte & 0x80; bits = byte & 0x7f; if (i <= 3 || (i == 4 && bits < (1 << 4))) @@ -139,8 +143,6 @@ static int leb(AVIOContext *pb, uint32_t *len) { return AVERROR_INVALIDDATA; if (++i == 8 && more) return AVERROR_INVALIDDATA; - if (pb->eof_reached || pb->error) - return pb->error ? pb->error : AVERROR(EIO); } while (more); return i; } @@ -170,15 +172,15 @@ static int annexb_probe(const AVProbeData *p) ffio_init_context(&ctx, p->buf, p->buf_size, 0, NULL, NULL, NULL, NULL); - ret = leb(pb, &temporal_unit_size); + ret = leb(pb, &temporal_unit_size, 1); if (ret < 0) return 0; cnt += ret; - ret = leb(pb, &frame_unit_size); + ret = leb(pb, &frame_unit_size, 0); if (ret < 0 || ((int64_t)frame_unit_size + ret) > temporal_unit_size) return 0; cnt += ret; - ret = leb(pb, &obu_unit_size); + ret = leb(pb, &obu_unit_size, 0); if (ret < 0 || ((int64_t)obu_unit_size + ret) >= frame_unit_size) return 0; cnt += ret; @@ -196,7 +198,7 @@ static int annexb_probe(const AVProbeData *p) cnt += obu_unit_size; do { - ret = leb(pb, &obu_unit_size); + ret = leb(pb, &obu_unit_size, 0); if (ret < 0 || ((int64_t)obu_unit_size + ret) > frame_unit_size) return 0; cnt += ret; @@ -234,19 +236,24 @@ retry: } if (!c->temporal_unit_size) { - len = leb(s->pb, &c->temporal_unit_size); - if (len < 0) return AVERROR_INVALIDDATA; + len = leb(s->pb, &c->temporal_unit_size, 1); + if (len == AVERROR_EOF) goto end; + else if (len < 0) return len; } if (!c->frame_unit_size) { - len = leb(s->pb, &c->frame_unit_size); - if (len < 0 || ((int64_t)c->frame_unit_size + len) > c->temporal_unit_size) + len = leb(s->pb, &c->frame_unit_size, 0); + if (len < 0) + return len; + if (((int64_t)c->frame_unit_size + len) > c->temporal_unit_size) return AVERROR_INVALIDDATA; c->temporal_unit_size -= len; } - len = leb(s->pb, &obu_unit_size); - if (len < 0 || ((int64_t)obu_unit_size + len) > c->frame_unit_size) + len = leb(s->pb, &obu_unit_size, 0); + if (len < 0) + return len; + if (((int64_t)obu_unit_size + len) > c->frame_unit_size) return AVERROR_INVALIDDATA; ret = av_get_packet(s->pb, pkt, obu_unit_size); From patchwork Sun Jun 4 02:02:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41969 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp2235335pzb; Sat, 3 Jun 2023 19:02:44 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7TL3ZExiqcPKtHd4kq1ZL3O0D16nikP4hKwl9Zjw1qjyy2mSluOmq3MN2TLx/sBS8PYYl2 X-Received: by 2002:a17:907:6e17:b0:96f:e7cf:501b with SMTP id sd23-20020a1709076e1700b0096fe7cf501bmr2502054ejc.33.1685844163930; Sat, 03 Jun 2023 19:02:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685844163; cv=none; d=google.com; s=arc-20160816; b=h96TXILbKVlKSKMB2n+R58kNZ7GG9FiQh+GTFcuc3VL8+8OMGy/ObD6NOQmYXm4okU ropyoQiZt3rJOoQ0nO2t7eqFODD4rcLJGJMdRLhvLVZVFicAPjwCb2GeIvLo1fGfJS9f G2oOW+JKCrsnnqWWcV6Bl3AjA/rkc5wfsA/644NEDWyqspT5f3IirvxslELwvbXVnvoO 4qdt/hs+UdFseI5rp3/Abv5dSM7ALnAHNxgkGePfwjxJu9BxS95WC56PCrAwZGIHd3Z9 iE0U3CmFMVzmJl53Wdire5+hhlH8InMdobHxHLD+ETLIYC5BdiycVw9unCruLc5FXKpu NlAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=qR9eVS8ReZB8XtKgx0obiPFa6Fk97C5llIqMMPFMBMo=; b=yAI0PnOxjo2vafwOOJsJ8/FNtn1TXk0gPXX64Xh41+PM3UV01qPQffbqSkxYWvr1WM SYBgspeDuHPmJS1P+mm/Z6yOWj/uqC823ZoU14D43pr7CnU86oPv5QuiQGx8o6qhufT+ Ed8/veZGv+DyU561SpV/o5O01Pvp9avFzbqMU97t/T1zoGvfhOW+KVLWLYqgO1XXDn9p 56g6q1A/NIxosYLXx6kTAgSnf0KaxilmgKu8ZrbqtDMqQKM724QV3No/iBH4bEty4QCq +Dr89+EuHFB23JlFEKABgXTbtOjhWN7g5f89pGTS0FFN+igHhuOTD/dq1LBJ4/5ukjh7 mxLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=fPZh+79P; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ex16-20020a170907955000b0097550901a57si2424125ejc.681.2023.06.03.19.02.43; Sat, 03 Jun 2023 19:02:43 -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=@gmail.com header.s=20221208 header.b=fPZh+79P; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BCDE068C396; Sun, 4 Jun 2023 05:02:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oo1-f49.google.com (mail-oo1-f49.google.com [209.85.161.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1F2B6689C13 for ; Sun, 4 Jun 2023 05:02:25 +0300 (EEST) Received: by mail-oo1-f49.google.com with SMTP id 006d021491bc7-558b83a10b4so89766eaf.3 for ; Sat, 03 Jun 2023 19:02:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685844143; x=1688436143; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LwBBQr7uLNt7yJyg1gxEkhLj5rdpt2CGkK3Dl3QvtrQ=; b=fPZh+79PvSa1Tkfa+qEMeavemMpXupNjJ5iyXi+8KCM4k6H3zynD5GV60JnO+/oXut L9y66GR1k6WqJ47s08BnguHbg7HopyP7JDF6GDgGqiWBlcPWZqB1y7itkZH0HWRMGeen V9IMdOEWRq9j8eScsGbaE/tftTewmy0vdLLXamZlCHHl9yHie1l6SuQpJTk/5vrWVbFB 50c6DcTNs+s9PJl8c2U9rjZI2lP8pCRI3dvhA4BHLMK3KxU+fsuJI/GTIw6hClGXte5+ l3qO6Eya3Xhgx3rlb35ojOuCtemWtb++qi0+QIST0EpbOWPw9i9ScY1OjS2Yv63HdS7b bv7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685844143; x=1688436143; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LwBBQr7uLNt7yJyg1gxEkhLj5rdpt2CGkK3Dl3QvtrQ=; b=SMfkkZKH0PwrfRP5LgacdXF4LWIdKQX42WpBQNmsogy+lxLGp68hUMYAvLg+nHDttv Hv4Z0Xzqu7k80yHC5bGVzdhfmM6h3SidPXLu95yvmikdhMpcHjzgpy+JXbAik/sS2WWw EHmdIL8Jl9RI7q3IRNhSySQ3R42ObsdyxSmgc+dD/rdc4Vho/6dPy+pFK5WFHJC+yl1T GWh9opfqT2EXTZSgNGaBJwgYI+5kYanlzjaq95rsbIKp49pxhtw5IF9VxpCaRv4RmvoO ISGCZUsGi4TT1ceNXRC2brDMkO/rq40mvbJD0egjHo9aA9C+9RbPSJ20m3iiUVFh6PMW pMgA== X-Gm-Message-State: AC+VfDxBwflx0JNV2AWyLggIKCQOmWUfYc3Z47H/Sr+cADxxkTuM28MM Mk2L+eQRPxh7wFGcteml24dOdWYOR/A= X-Received: by 2002:a4a:ba87:0:b0:558:b78d:8d1c with SMTP id d7-20020a4aba87000000b00558b78d8d1cmr510766oop.7.1685844143463; Sat, 03 Jun 2023 19:02:23 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id x1-20020a4ad041000000b0054f6fb0ec57sm1930570oor.11.2023.06.03.19.02.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jun 2023 19:02:23 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Jun 2023 23:02:13 -0300 Message-Id: <20230604020214.1527-2-jamrial@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230604020214.1527-1-jamrial@gmail.com> References: <20230604020214.1527-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/av1dec: don't return EIO when the input file is truncated 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: K7ED0J0JMgu2 There was no problem reading the file, so EIO is not correct. Signed-off-by: James Almer --- libavformat/av1dec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index 79ad8a9411..501b0cc93f 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -134,7 +134,7 @@ static int leb(AVIOContext *pb, uint32_t *len, int eof) { if (pb->error) return pb->error; if (pb->eof_reached) - return (eof && !i) ? AVERROR_EOF : AVERROR(EIO); + return (eof && !i) ? AVERROR_EOF : AVERROR_INVALIDDATA; more = byte & 0x80; bits = byte & 0x7f; if (i <= 3 || (i == 4 && bits < (1 << 4))) @@ -231,7 +231,7 @@ static int annexb_read_packet(AVFormatContext *s, AVPacket *pkt) retry: if (avio_feof(s->pb)) { if (c->temporal_unit_size || c->frame_unit_size) - return AVERROR(EIO); + return AVERROR_INVALIDDATA; goto end; } @@ -260,7 +260,7 @@ retry: if (ret < 0) return ret; if (ret != obu_unit_size) - return AVERROR(EIO); + return AVERROR_INVALIDDATA; c->temporal_unit_size -= obu_unit_size + len; c->frame_unit_size -= obu_unit_size + len; From patchwork Sun Jun 4 02:02:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41970 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c51c:b0:10c:5e6f:955f with SMTP id gm28csp2235391pzb; Sat, 3 Jun 2023 19:02:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5H4uwGGKZ/75YQMXPdVyNP8nPnmm4R2C7EygA1opk463pzS2sKEBfjYbTR5JcEXCTL4O/7 X-Received: by 2002:aa7:db4b:0:b0:514:a454:175b with SMTP id n11-20020aa7db4b000000b00514a454175bmr7179696edt.6.1685844171782; Sat, 03 Jun 2023 19:02:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685844171; cv=none; d=google.com; s=arc-20160816; b=kkxaGXNcCsj2nxzfW6L1/PeGiLekNCXKaYovcGGNWNDRyLato+SEZEDu6V3Vx5p+f+ EZyc1w6zlK3d4O0VY0KjF2zAtIqsg4ZRAvygU+WZXKO0kkVaA6lw39K/wyAkiXTGKcuN jfl7C0juccSkQqxUksueU0WX/d+/s3FiUwQHaAx35gy887T1UsFrF51cnYi3XOMrZW43 ucWLYTBPkf52siujFrewJ4bdbRi5YM6q/OT0M7fqtk61yEOpghYWX3GYYGcdlMEjEWZK up+Q+SvLPeIQx42byrA+fDm/Qq0Cr2jvyP4ff7phQwuWtbR0kRqqIDQ9yZCrQmxjya0M XMVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=YRjQdph+fCD+3T8i7xqJ2K9wxjvGCKhky6u9OhPyUhY=; b=bRSZeq53QTTwmhDEA4vhuvB+Y0lc9v6rKQzJaNeqPsogPBdSjLKP0SH2YgM+nN8nwe PxZJHjdmPOAGS5TMPmNmlfsSPUmUb6eYn7LhsFBLklJMuj1NTMPQaukp4H4nmYnssPnh PzVS8SLXtPwED09oUtQVqGBDkpu3nm7lqL0c02t8BQWe5vjbNUzmmcUROQe+xKNu038p /tlR2Frsic6Z2V03ftSc8JugqFZbRUmcxTEvoSfqcKaGjCs/x7itfbRpMvTCJ8jS0r2m 9vUZ0lxkLaPQU3F/orSJOCDkFPBCXRjbh0+bLba3ZVX1rRadnt6V+6LXLvKhzjQiZdhA D7Pg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=sMvSB+MB; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u21-20020aa7d995000000b005149e3fccc7si3109253eds.329.2023.06.03.19.02.51; Sat, 03 Jun 2023 19:02:51 -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=@gmail.com header.s=20221208 header.b=sMvSB+MB; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF7BD68C38D; Sun, 4 Jun 2023 05:02:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f54.google.com (mail-oa1-f54.google.com [209.85.160.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 938B568C396 for ; Sun, 4 Jun 2023 05:02:26 +0300 (EEST) Received: by mail-oa1-f54.google.com with SMTP id 586e51a60fabf-1a28817f70bso3231266fac.2 for ; Sat, 03 Jun 2023 19:02:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1685844145; x=1688436145; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=BsZUHgjMc+JNeoFZ+jhHsn6qnzTufet2cwKMfCPdpcw=; b=sMvSB+MB/Nx+6qheJjLvquMt0urTU8KXn1R0cbsSdGbPYRLIHRu6jaNqujzPWfxEqE qMM9lMnKJdCxdk4UoWLcCDZL2BZsBQZ4F5+SlGp4IkPereqV70nR4jpVNoVaL5wnPFB2 51wjIK3qzFLPodRo6ww9XGeVqihqmhM/U63vpdM/qgBGqA6Yr3kpavJor3lGAVNQdUSn agCp4gub3nRleZk2A9z7e7tgmzl7Yo47tPysbQR8LjGfaYYWQiUNTZnU0nlJ62y4iUFH AfLnNwZHiTfkRWmqXYPqn+bxpNp4P712KbfhlmJDhR81XOWfodvNOjT7DSSJo8FEeOAl 4G1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685844145; x=1688436145; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=BsZUHgjMc+JNeoFZ+jhHsn6qnzTufet2cwKMfCPdpcw=; b=JKK4YLAVIhtdQgT6k7RJ5MCviIvCrR34NEocdyT0eX9CXrYD2lUvmXLPJ4TaN38zXA Q8S2K8Xui00qKE6Js5NGn6SJW/rOkR1yn/I4JPgePl1BUb5QrQbRd9Oaln6nOa+fYdns uABtV5i3eZrln1rNUuc4bL47lNR4oxgVVNuFzS9pFrcY1twO1PbT32nJ0uMZRGC/LXDp MmY5ZEDjby9/UVDA/5bGAuP6In+yxjtgtLVAwyfdC9ZOhkeCfd7ILAC2spgPNhxa4Qa1 8qT3Usuqiwg8N97VAIDANoXjAz9p5pTQICfieKV2sVHZWCzAWGotawNcZkLRBxICbO9E 9jwQ== X-Gm-Message-State: AC+VfDzFkYsKM9qYo+PRu0+4TJsNQ1vZpdtSkeKYM9+uNa3v+FJ2Mqpn GYLfA3ZpjYdUd86Kg4HloaEcaFw2jjk= X-Received: by 2002:a05:6870:772d:b0:19f:8798:3d9d with SMTP id dw45-20020a056870772d00b0019f87983d9dmr6159091oab.27.1685844144657; Sat, 03 Jun 2023 19:02:24 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id x1-20020a4ad041000000b0054f6fb0ec57sm1930570oor.11.2023.06.03.19.02.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Jun 2023 19:02:24 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 3 Jun 2023 23:02:14 -0300 Message-Id: <20230604020214.1527-3-jamrial@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230604020214.1527-1-jamrial@gmail.com> References: <20230604020214.1527-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/av1: reduce the scope of a variable 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4BMt8Vjrhix4 Signed-off-by: James Almer --- libavformat/av1dec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index 501b0cc93f..d0d53f41f7 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -126,11 +126,10 @@ static const AVClass av1_demuxer_class = { static int leb(AVIOContext *pb, uint32_t *len, int eof) { int more, i = 0; - uint8_t byte; *len = 0; do { unsigned bits; - byte = avio_r8(pb); + int byte = avio_r8(pb); if (pb->error) return pb->error; if (pb->eof_reached)