git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0106a20
)
avformat/segafilm: Fix current_sample after seeking and avio_seek return type
author
Michael Niedermayer
<michael@niedermayer.cc>
Thu, 12 Nov 2015 22:37:21 +0000
(23:37 +0100)
committer
Michael 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
patch
|
blob
|
history
diff --git
a/libavformat/segafilm.c
b/libavformat/segafilm.c
index
86917e7
..
94b3772
100644
(file)
--- 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;