From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 55B46440B2 for ; Sun, 25 Sep 2022 04:30:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A63C368BB42; Sun, 25 Sep 2022 07:30:28 +0300 (EEST) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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; -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".