diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-07 15:57:02 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-07 15:57:02 +0100 |
| commit | e92aa34d7ba50ceb4bb51a1bc906cd9f60c6cc9b (patch) | |
| tree | 2a0eafe81f573cb1e6f6188426db5a2c2a81cdb9 /libavformat/avidec.c | |
| parent | ee367fadf5c1bcdf07fc0e4440c405ef74211733 (diff) | |
| parent | d017ed878a45171f2f6c69fb9d76401c3c494110 (diff) | |
| download | ffmpeg-streaming-e92aa34d7ba50ceb4bb51a1bc906cd9f60c6cc9b.zip ffmpeg-streaming-e92aa34d7ba50ceb4bb51a1bc906cd9f60c6cc9b.tar.gz | |
Merge commit 'd017ed878a45171f2f6c69fb9d76401c3c494110'
* commit 'd017ed878a45171f2f6c69fb9d76401c3c494110':
avi: Use the correct data type
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavformat/avidec.c')
| -rw-r--r-- | libavformat/avidec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index be54b14..dc72c14 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -480,6 +480,7 @@ static int avi_read_header(AVFormatContext *s) int avih_width = 0, avih_height = 0; int amv_file_format = 0; uint64_t list_end = 0; + int64_t pos; int ret; AVDictionaryEntry *dict_entry; @@ -930,13 +931,13 @@ static int avi_read_header(AVFormatContext *s) } break; case MKTAG('i', 'n', 'd', 'x'): - i = avio_tell(pb); + pos = avio_tell(pb); if (pb->seekable && !(s->flags & AVFMT_FLAG_IGNIDX) && avi->use_odml && read_braindead_odml_indx(s, 0) < 0 && (s->error_recognition & AV_EF_EXPLODE)) goto fail; - avio_seek(pb, i + size, SEEK_SET); + avio_seek(pb, pos + size, SEEK_SET); break; case MKTAG('v', 'p', 'r', 'p'): if (stream_index < (unsigned)s->nb_streams && size > 9 * 4) { |
