[FFmpeg-cvslog] avformat/segafilm: Fix current_sample after seeking and avio_seek return type

Michael Niedermayer git at videolan.org
Thu Nov 12 23:49:13 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Nov 12 23:37:21 2015 +0100| [5324109dd7e1bfc0236bf74a492a66f26289d16e] | committer: Michael Niedermayer

avformat/segafilm: Fix current_sample after seeking and avio_seek return type

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/segafilm.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c
index 86917e7..94b3772 100644
--- a/libavformat/segafilm.c
+++ b/libavformat/segafilm.c
@@ -296,13 +296,14 @@ static int film_read_seek(AVFormatContext *s, int stream_index, int64_t timestam
 {
     FilmDemuxContext *film = s->priv_data;
     AVStream *st = s->streams[stream_index];
+    int64_t pos;
     int ret = av_index_search_timestamp(st, timestamp, flags);
     if (ret < 0)
         return ret;
 
-    ret = avio_seek(s->pb, st->index_entries[ret].pos, SEEK_SET);
-    if (ret < 0)
-        return ret;
+    pos = avio_seek(s->pb, st->index_entries[ret].pos, SEEK_SET);
+    if (pos < 0)
+        return pos;
 
     film->current_sample = ret;
 



More information about the ffmpeg-cvslog mailing list