[FFmpeg-cvslog] avformat/aviobuf: Avoid calling function twice due to FFMAX()
Andreas Rheinhardt
git at videolan.org
Thu Aug 26 02:05:39 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Wed Aug 4 20:36:48 2021 +0200| [7cfff1512c41a95f50a020854d40c813b9a8b1ec] | committer: Andreas Rheinhardt
avformat/aviobuf: Avoid calling function twice due to FFMAX()
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7cfff1512c41a95f50a020854d40c813b9a8b1ec
---
libavformat/aviobuf.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/libavformat/aviobuf.c b/libavformat/aviobuf.c
index 66fddf1433..164b07ae6a 100644
--- a/libavformat/aviobuf.c
+++ b/libavformat/aviobuf.c
@@ -274,8 +274,10 @@ int64_t avio_seek(AVIOContext *s, int64_t offset, int whence)
return AVERROR(EINVAL);
short_seek = s->short_seek_threshold;
- if (s->short_seek_get)
- short_seek = FFMAX(s->short_seek_get(s->opaque), short_seek);
+ if (s->short_seek_get) {
+ int tmp = s->short_seek_get(s->opaque);
+ short_seek = FFMAX(tmp, short_seek);
+ }
offset1 = offset - pos; // "offset1" is the relative offset from the beginning of s->buffer
s->buf_ptr_max = FFMAX(s->buf_ptr_max, s->buf_ptr);
More information about the ffmpeg-cvslog
mailing list