diff options
| author | Maksym Veremeyenko <verem@m1stereo.tv> | 2007-06-25 02:08:04 +0000 |
|---|---|---|
| committer | Roman Shaposhnik <roman@shaposhnik.org> | 2007-06-25 02:08:04 +0000 |
| commit | 05ce0f11e4019f9a0d3fe528b0890f57664b442c (patch) | |
| tree | 6b459772f8fd5d466c77cbdc41a5e1c9180178dd /libavformat | |
| parent | ffaa3ecb60704dd1ccc2c8365d1afe7fa97691b9 (diff) | |
| download | ffmpeg-05ce0f11e4019f9a0d3fe528b0890f57664b442c.tar.gz | |
* clarifying the AVInputFormat::read_seek return value
* changing dv_read_seek() to return the proper value
(patch by Maksym Veremeyenko)
Originally committed as revision 9418 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 1 | ||||
| -rw-r--r-- | libavformat/dv.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index e7613af7ee..3c61e192ed 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -216,6 +216,7 @@ typedef struct AVInputFormat { * @param stream_index must not be -1 * @param flags selects which direction should be preferred if no exact * match is available + * @return >= 0 on success (but not necessarily the new offset) */ int (*read_seek)(struct AVFormatContext *, int stream_index, int64_t timestamp, int flags); diff --git a/libavformat/dv.c b/libavformat/dv.c index 10a3062601..e459ed9742 100644 --- a/libavformat/dv.c +++ b/libavformat/dv.c @@ -426,7 +426,8 @@ static int dv_read_seek(AVFormatContext *s, int stream_index, dv_offset_reset(c, offset / c->sys->frame_size); - return url_fseek(&s->pb, offset, SEEK_SET); + offset = url_fseek(&s->pb, offset, SEEK_SET); + return (offset < 0)?offset:0; } static int dv_read_close(AVFormatContext *s) |