Bug 1324381: P3. Ignore duration sets to -1. r=gerald

MozReview-Commit-ID: 7RH5deLo0Pm

--HG--
extra : rebase_source : bcc36b2b03687d50242a8d324e88e63966442b1d
This commit is contained in:
Jean-Yves Avenard 2016-12-19 21:04:46 +11:00
Родитель 778399ee27
Коммит 6e751096f7
1 изменённых файлов: 8 добавлений и 1 удалений

Просмотреть файл

@ -1105,7 +1105,12 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
< (ssize_t)sizeof(duration)) {
return ERROR_IO;
}
duration = ntoh64(duration);
// Avoid duration sets to -1, which is incorrect.
if (duration != -1) {
duration = ntoh64(duration);
} else {
duration = 0;
}
} else {
uint32_t duration32;
if (mDataSource->readAt(
@ -1116,6 +1121,8 @@ status_t MPEG4Extractor::parseChunk(off64_t *offset, int depth) {
// ffmpeg sets duration to -1, which is incorrect.
if (duration32 != 0xffffffff) {
duration = ntohl(duration32);
} else {
duration = 0;
}
}
if (duration < 0) {