[FFmpeg-cvslog] avformat/cafdec: Avoid unnecessary avio_tell() calls

Andreas Rheinhardt git at videolan.org
Fri Nov 26 20:20:44 EET 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Nov 20 13:46:21 2021 +0100| [7c2b9067d065a1ed503aa76ea82e5dd1763452dd] | committer: Andreas Rheinhardt

avformat/cafdec: Avoid unnecessary avio_tell() calls

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c2b9067d065a1ed503aa76ea82e5dd1763452dd
---

 libavformat/cafdec.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
index 3ff0558afe..4b5b15b58d 100644
--- a/libavformat/cafdec.c
+++ b/libavformat/cafdec.c
@@ -224,7 +224,7 @@ static int read_pakt_chunk(AVFormatContext *s, int64_t size)
         av_log(s, AV_LOG_ERROR, "error reading packet table\n");
         return AVERROR_INVALIDDATA;
     }
-    avio_skip(pb, ccount + size - avio_tell(pb));
+    avio_seek(pb, ccount + size, SEEK_SET);
 
     caf->num_bytes = pos;
     return 0;
@@ -331,7 +331,7 @@ static int read_header(AVFormatContext *s)
         if (size > 0 && (pb->seekable & AVIO_SEEKABLE_NORMAL)) {
             if (pos > INT64_MAX - size)
                 return AVERROR_INVALIDDATA;
-            avio_skip(pb, FFMAX(0, pos + size - avio_tell(pb)));
+            avio_seek(pb, pos + size, SEEK_SET);
         }
     }
 



More information about the ffmpeg-cvslog mailing list