* [FFmpeg-devel] [PATCH 2/2] avformat/mp3dec: remove a call to avio_tell() [not found] <20220925042841.522188-1-quinkblack@foxmail.com> @ 2022-09-25 4:28 ` Zhao Zhili 2022-10-04 9:01 ` Anton Khirnov 0 siblings, 1 reply; 3+ messages in thread From: Zhao Zhili @ 2022-09-25 4:28 UTC (permalink / raw) To: ffmpeg-devel; +Cc: Zhao Zhili 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". ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] avformat/mp3dec: remove a call to avio_tell() 2022-09-25 4:28 ` [FFmpeg-devel] [PATCH 2/2] avformat/mp3dec: remove a call to avio_tell() Zhao Zhili @ 2022-10-04 9:01 ` Anton Khirnov 2022-10-08 16:41 ` Zhao Zhili 0 siblings, 1 reply; 3+ messages in thread From: Anton Khirnov @ 2022-10-04 9:01 UTC (permalink / raw) To: FFmpeg development discussions and patches; +Cc: Zhao Zhili Quoting Zhao Zhili (2022-09-25 06:28:41) > 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); Looks ok. -- Anton Khirnov _______________________________________________ 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". ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] avformat/mp3dec: remove a call to avio_tell() 2022-10-04 9:01 ` Anton Khirnov @ 2022-10-08 16:41 ` Zhao Zhili 0 siblings, 0 replies; 3+ messages in thread From: Zhao Zhili @ 2022-10-08 16:41 UTC (permalink / raw) To: ffmpeg-devel On Tue, 2022-10-04 at 11:01 +0200, Anton Khirnov wrote: > Quoting Zhao Zhili (2022-09-25 06:28:41) > > From: Zhao Zhili <zhilizhao@tencent.com> > > > > --- > > libavformat/mp3dec.c | 9 ++++----- > > 1 file changed, 4 insertions(+), 5 deletions(-) > > Looks ok. Pushed, thanks for review. _______________________________________________ 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". ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-08 16:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20220925042841.522188-1-quinkblack@foxmail.com>
2022-09-25 4:28 ` [FFmpeg-devel] [PATCH 2/2] avformat/mp3dec: remove a call to avio_tell() Zhao Zhili
2022-10-04 9:01 ` Anton Khirnov
2022-10-08 16:41 ` Zhao Zhili
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