har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'd017ed878a45171f2f6c69fb9d76401c3c494110'

Browse Source 
* commit 'd017ed878a45171f2f6c69fb9d76401c3c494110':
  avi: Use the correct data type

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-12-07 15:57:02 +01:00
commit e92aa34d7b
1 changed files with 3 additions and 2 deletions

5
libavformat/avidec.c

@ -480,6 +480,7 @@ static int avi_read_header(AVFormatContext *s)
int avih_width = 0, avih_height = 0; int avih_width = 0, avih_height = 0;
int amv_file_format = 0; int amv_file_format = 0;
uint64_t list_end = 0; uint64_t list_end = 0;
int64_t pos;
int ret; int ret;
AVDictionaryEntry *dict_entry; AVDictionaryEntry *dict_entry;
@ -930,13 +931,13 @@ static int avi_read_header(AVFormatContext *s)
} }
break; break;
case MKTAG('i', 'n', 'd', 'x'): case MKTAG('i', 'n', 'd', 'x'):
i = avio_tell(pb); pos = avio_tell(pb);
if (pb->seekable && !(s->flags & AVFMT_FLAG_IGNIDX) && if (pb->seekable && !(s->flags & AVFMT_FLAG_IGNIDX) &&
avi->use_odml && avi->use_odml &&
read_braindead_odml_indx(s, 0) < 0 && read_braindead_odml_indx(s, 0) < 0 &&
(s->error_recognition & AV_EF_EXPLODE)) (s->error_recognition & AV_EF_EXPLODE))
goto fail; goto fail;
avio_seek(pb, i + size, SEEK_SET); avio_seek(pb, pos + size, SEEK_SET);
break; break;
case MKTAG('v', 'p', 'r', 'p'): case MKTAG('v', 'p', 'r', 'p'):
if (stream_index < (unsigned)s->nb_streams && size > 9 * 4) { if (stream_index < (unsigned)s->nb_streams && size > 9 * 4) {