| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-05 09:35:34 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-05 09:35:39 (GMT) |
| commit | 922596e3dac8a9a8ed6a6738c7085e70dfef8ff3 (patch) | |
| tree | 21fd350bf23fdd817eeb2c24f426762dc757a8b1 | |
| parent | 47a57c6832d008f676837a9ee5f3a45b828c9ca1 (diff) | |
| parent | a4435f9235eefac8a25f1cda471486e2c37b21b5 (diff) | |
| download | ffmpeg-922596e3dac8a9a8ed6a6738c7085e70dfef8ff3.zip ffmpeg-922596e3dac8a9a8ed6a6738c7085e70dfef8ff3.tar.gz ffmpeg-922596e3dac8a9a8ed6a6738c7085e70dfef8ff3.tar.bz2 | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ismindex: Change the duration field to int64_t
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | tools/ismindex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/ismindex.c b/tools/ismindex.c index b187790..4dc3e12 100644 --- a/tools/ismindex.c +++ b/tools/ismindex.c @@ -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); } } |