From patchwork Sun Sep 25 04:28:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 38259 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1470157pzh; Sat, 24 Sep 2022 21:30:45 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5naNx7Koj97Dwu04w1xPURUamYLt1UerojrdJWLfQVv6d0dWVbU/CICAEA6Q5QxiIpPY/Y X-Received: by 2002:a05:6402:40cc:b0:452:697e:da18 with SMTP id z12-20020a05640240cc00b00452697eda18mr15703846edb.288.1664080245126; Sat, 24 Sep 2022 21:30:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664080245; cv=none; d=google.com; s=arc-20160816; b=FQlSiPW8h80IlrT36Q83k5asuFqORTQH7iyJ73o90qk+dYcxCXa8EvXFKb5SVGYyt9 bkjGqAJ8mYeE0rEMWepPZG8209/3ZgqG9xnyavnypJbVhhOMgRhOS+Lj+FzMg60Q/GqZ G+chuP48Is1utW7PoZpzVeCKHW0RnAAy0caVUwR/mFyM/zOjvox3ydL9uHyBUIU1KcOp F6Hz1iVM++svjWSH29vd3X+Oki8562/5ayALg2Ng2NDBwDUhJl7yO/zjtqho5wF8W7qL EPTVr0AhZg5NFvqI6/0WgZ985n4pMEMHDTcemNAYEJnRLAB/szoIjFATOi9xfUa0UGeL NrQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=1VToCZy1L0eesSNnHmdfNbhj7gdgaAoeOHDR6/PXKY0=; b=woPJ3KKpNJ6JaFmXRYliWjgUz2CUg4dl32O6ADg+XMV6G5Ai7+ssacO09B/7GZG+FB W8O2sxMdsCDv/HhQHAzDWyynyrNRxx6og1uIRMp/pEfUoYB01ofObTdAZqHxAZS7oVYk YJ9eM1ldvaiDMt1q9o1tUQgXFSl8cvD7Rq07FgHRM0szbP+/fXO+8zu/r0Jw7G8RZXtr F6MtBf+J6UMPoRbWvZ9Ib/k+O5idKukuRhDPJFkxeaRWkUYRyjwtZ0CIoKuHU8vnOngI m+rfcDEaBdL9LrTo+mh0kKrOGuEZKpxDAompx/p0EPPpnXZCo0GErf+g01rc4q3Gclm5 DVQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=ccRmBjK+; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ds2-20020a170907724200b00782d5dbe2b5si4258417ejc.746.2022.09.24.21.30.44; Sat, 24 Sep 2022 21:30:45 -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=@foxmail.com header.s=s201512 header.b=ccRmBjK+; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DD70268BB70; Sun, 25 Sep 2022 07:30:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-164.mail.qq.com (out203-205-221-164.mail.qq.com [203.205.221.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 672BD68BB39 for ; Sun, 25 Sep 2022 07:30:20 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1664080217; bh=3yzhPRqIA+cALD5KoZz6syvqoo7hLVcooXta4crPNi4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ccRmBjK+0bQyG7HruqEREVoP1g6DaXBsp37gDELP0NK3EElyUQSbA6rXqP6oVdXxC VdVRgZdm1A1ngph3gSp1+O9Xt2gKksuK1V1cg+OxzPA8ow/1gEiP3rMh13z/SVwBRF dNNLR/xxRdFJY21Dc+R6fD5KvOxefc3eGiGTM0kY= Received: from localhost.localdomain ([121.35.186.57]) by newxmesmtplogicsvrsza9.qq.com (NewEsmtp) with SMTP id 7462EC45; Sun, 25 Sep 2022 12:29:06 +0800 X-QQ-mid: xmsmtpt1664080147t7jbc7o4p Message-ID: X-QQ-XMAILINFO: M310wetdPxmX/RyNN4RTQTqJkUT9TdxotWeId0GMKedOQIumBgPS4cOorQQ8hx ilDrGOkU+ODldBoPef2sNioeIhSPaPmy5h51I9RQGHFlX7fBrDjwJ5nHQwEeOcSTGd91i4lrIh3F OiBo4Q7yOOs7nCCTjAZ9mSKM+l+82oLbBdKcck6NU4JefPJ5cyy405ZFCnRADEceA4w55dBXbT5s JWC5rkBJiw8CKUjCYE9/CakmoAZGcJEj8i/ujTo0VFSJJ9hd54IJZanlPV6z3OybRkYOHq4MskSG cqCTK3c1+euAkbf96MIPi4nXwUy8/NjD+6JQ5JQi+aRiLxYA/XnZIgseFEBxzEq2/cn8j9Irte/L T6Xmh+fIN5CpOkipis2ptYp+sKlyhqX6K1kYIxY9Z9YPynfNyLdscT1EPMVfX3ibzeVCM0mGLy16 4G/2G67OukAbzqaE/A1rLlgAIdT/mtBNU2F2xN2azjSiGc9ZCjF9a3o2k5peP7ruvA/k1f6jHaUW QW5hn1PKCW0NkvyCOv5fPslyb++TA95eiofKGNTsYj6SD+8fi1Lbx5gYcR7MfWNarZN4I8nu/T6H u8CTD+NxYNW+I0IayjGo+Uj/uGeePyeIoe15thmEF3+Eh1gW1LqmIgm8Cn2pgANZSBb6G0wknPv0 dSah1Zfu9FLETWDRO12NMwnWuXuGIvpQT6TmcMqaIpmZi9SvuMAAm4jf0BgAnNYjg7Dz/+67J1Zz XtqOHLvbS+2J98HvXD5BNjNNC2nF7d6uwQeFODjVtvfAxAk1QMYSLhR6AIxcSwcIhhU/+fpOxaLZ EjAjw7advl3rZ4eT4sUPGi0REUCgbW1TCtrPJF2Uc6zsgG9EsUR2G2NGrOzrcy+lR5jM4wABePIm qY4y+nlyzWdGeVhAny3LaP7naOCkR6+Q9r5a6Vwcgj5qVJ9muwQhAMPqVoUbYxDJtKbVZOm1X/H+ majUx9pd2xk1VjXdF5+jjMotr9ZJtO From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Sep 2022 12:28:41 +0800 X-OQ-MSGID: <20220925042841.522188-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220925042841.522188-1-quinkblack@foxmail.com> References: <20220925042841.522188-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mp3dec: remove a call to avio_tell() 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: weRNQhWmPP3A From: Zhao Zhili --- libavformat/mp3dec.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index a9e494452d..05c13228bc 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -424,15 +424,14 @@ static int mp3_read_header(AVFormatContext *s) } } if (i == 64 * 1024) { - ret = avio_seek(s->pb, off, SEEK_SET); + off = avio_seek(s->pb, off, SEEK_SET); } else { av_log(s, i > 0 ? AV_LOG_INFO : AV_LOG_VERBOSE, "Skipping %d bytes of junk at %"PRId64".\n", i, off); - ret = avio_seek(s->pb, off + i, SEEK_SET); + off = avio_seek(s->pb, off + i, SEEK_SET); } - if (ret < 0) - return ret; + if (off < 0) + return off; - off = avio_tell(s->pb); // the seek index is relative to the end of the xing vbr headers for (int i = 0; i < sti->nb_index_entries; i++) sti->index_entries[i].pos += off;