[FFmpeg-cvslog] [wtv] Check return value of avio_seek and avoid modifying state if it fails
Joakim Plate
git at videolan.org
Wed Sep 14 20:05:37 CEST 2011
ffmpeg | branch: master | Joakim Plate <elupus at ecce.se> | Wed Sep 14 19:42:33 2011 +0200| [7bcd81299a83b28ee8266079646470dd3e02f2ef] | committer: Joakim Plate
[wtv] Check return value of avio_seek and avoid modifying state if it fails
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7bcd81299a83b28ee8266079646470dd3e02f2ef
---
libavformat/wtvdec.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
index e27fa14..af0b711 100644
--- a/libavformat/wtvdec.c
+++ b/libavformat/wtvdec.c
@@ -997,19 +997,23 @@ static int read_seek(AVFormatContext *s, int stream_index,
i = ff_index_search_timestamp(wtv->index_entries, wtv->nb_index_entries, ts_relative, flags);
if (i < 0) {
- if (wtv->last_valid_pts == AV_NOPTS_VALUE || ts < wtv->last_valid_pts)
- avio_seek(pb, 0, SEEK_SET);
- else if (st->duration != AV_NOPTS_VALUE && ts_relative > st->duration && wtv->nb_index_entries)
- avio_seek(pb, wtv->index_entries[wtv->nb_index_entries - 1].pos, SEEK_SET);
+ if (wtv->last_valid_pts == AV_NOPTS_VALUE || ts < wtv->last_valid_pts) {
+ if (avio_seek(pb, 0, SEEK_SET) < 0)
+ return -1;
+ } else if (st->duration != AV_NOPTS_VALUE && ts_relative > st->duration && wtv->nb_index_entries) {
+ if (avio_seek(pb, wtv->index_entries[wtv->nb_index_entries - 1].pos, SEEK_SET) < 0)
+ return -1;
+ }
if (parse_chunks(s, SEEK_TO_PTS, ts, 0) < 0)
return AVERROR(ERANGE);
return 0;
}
+ if (avio_seek(pb, wtv->index_entries[i].pos, SEEK_SET) < 0)
+ return -1;
wtv->pts = wtv->index_entries[i].timestamp;
if (wtv->epoch != AV_NOPTS_VALUE)
wtv->pts += wtv->epoch;
wtv->last_valid_pts = wtv->pts;
- avio_seek(pb, wtv->index_entries[i].pos, SEEK_SET);
return 0;
}
More information about the ffmpeg-cvslog
mailing list