]> git.sesse.net Git - ffmpeg/commitdiff
avformat/segafilm: Fix current_sample after seeking and avio_seek return type
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 12 Nov 2015 22:37:21 +0000 (23:37 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 12 Nov 2015 22:37:21 +0000 (23:37 +0100)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/segafilm.c

index 86917e78212ab4c052c2f22a1bcbe95448b20660..94b377215e6ebd0775c1147be9f6e4451b5a5683 100644 (file)
@@ -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;