From: Zhao Zhili <quinkblack@foxmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Zhao Zhili <zhilizhao@tencent.com>
Subject: [FFmpeg-devel] [PATCH 2/2] avformat/mp3dec: remove a call to avio_tell()
Date: Sun, 25 Sep 2022 12:28:41 +0800
Message-ID: <tencent_0F884C13EC536B35D56904EEB7C540D31405@qq.com> (raw)
In-Reply-To: <20220925042841.522188-1-quinkblack@foxmail.com>
From: Zhao Zhili <zhilizhao@tencent.com>
---
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".
next parent reply other threads:[~2022-09-25 4:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20220925042841.522188-1-quinkblack@foxmail.com>
2022-09-25 4:28 ` Zhao Zhili [this message]
2022-10-04 9:01 ` Anton Khirnov
2022-10-08 16:41 ` Zhao Zhili
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_0F884C13EC536B35D56904EEB7C540D31405@qq.com \
--to=quinkblack@foxmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=zhilizhao@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git