RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master' 

* qatar/master:
  ismindex: Change the duration field to int64_t

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-10-05 11:35:34 +02:00
parent 47a57c6832 a4435f9235
commit 922596e3da
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/ismindex.c
View File

@ -51,7 +51,7 @@ static int usage(const char *argv0, int ret)
struct MoofOffset {
int64_t time;
int64_t offset;
int duration;
int64_t duration;
};
struct Track {
@ -431,7 +431,7 @@ static void print_track_chunks(FILE *out, struct Tracks *tracks, int main,
fprintf(stderr, "Mismatched duration of %s chunk %d in %s and %s\n",
type, i, track->name, tracks->tracks[j]->name);
}
fprintf(out, "\t\t<c n=\"%d\" d=\"%d\" />\n",
fprintf(out, "\t\t<c n=\"%d\" d=\"%"PRId64"\" />\n",
i, track->offsets[i].duration);
}
}