1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

Merge commit '87e5d8d78cf08b54b4a9e7cbaeff89f8c1d91b78'

* commit '87e5d8d78cf08b54b4a9e7cbaeff89f8c1d91b78':
  ismindex: Use the correct abs() version

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-09-07 12:27:21 +02:00
commit 84cca0644a

View File

@ -378,7 +378,7 @@ static int read_tfra(struct Tracks *tracks, int start_index, AVIOContext *f)
// Now try and read the actual durations from the trun sample data. // Now try and read the actual durations from the trun sample data.
for (i = 0; i < track->chunks; i++) { for (i = 0; i < track->chunks; i++) {
int64_t duration = read_moof_duration(f, track->offsets[i].offset); int64_t duration = read_moof_duration(f, track->offsets[i].offset);
if (duration > 0 && abs(duration - track->offsets[i].duration) > 3) { if (duration > 0 && llabs(duration - track->offsets[i].duration) > 3) {
// 3 allows for integer duration to drift a few units, // 3 allows for integer duration to drift a few units,
// e.g., for 1/3 durations // e.g., for 1/3 durations
track->offsets[i].duration = duration; track->offsets[i].duration = duration;