diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-05 03:02:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-05 03:02:34 +0100 |
| commit | bfb5ba8495e19f6078bb5bd42ea5793355da5e28 (patch) | |
| tree | 0952604dcac1373eb654a83c6cb0dea251d5ee4d /libavformat | |
| parent | 7e850f1cd053066bf06e772ca79ad95c99d9b6b3 (diff) | |
| parent | 86b57e4efea649246d882fcfdfa02e148a736496 (diff) | |
| download | ffmpeg-bfb5ba8495e19f6078bb5bd42ea5793355da5e28.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ape: fix seeking
apedec: 8bit and 24bit support
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/ape.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/ape.c b/libavformat/ape.c index ffb8f5a384..d4d0ac9d57 100644 --- a/libavformat/ape.c +++ b/libavformat/ape.c @@ -406,6 +406,8 @@ static int ape_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp if (index < 0) return -1; + if (avio_seek(s->pb, st->index_entries[index].pos, SEEK_SET) < 0) + return -1; ape->currentframe = index; return 0; } |