aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-05 11:13:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-05 11:14:26 +0200
commit5de251a3e32e75c01bfc0c66be628fb9f07fdd04 (patch)
treee02c9163639463b68b424e75500806cf6f0e9f31 /tools
parenta7630e3755deb3d19469e6e05dd23690caf98eb8 (diff)
parentd347a7b248d4ffdc278373fecf033b0ade030343 (diff)
downloadffmpeg-5de251a3e32e75c01bfc0c66be628fb9f07fdd04.tar.gz
Merge commit 'd347a7b248d4ffdc278373fecf033b0ade030343'
* commit 'd347a7b248d4ffdc278373fecf033b0ade030343': ismindex: Use the individual stream duration instead of the global one Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
-rw-r--r--tools/ismindex.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/ismindex.c b/tools/ismindex.c
index ef8e1f4ee6..9b4d5717e7 100644
--- a/tools/ismindex.c
+++ b/tools/ismindex.c
@@ -326,8 +326,7 @@ static int handle_file(struct Tracks *tracks, const char *file, int split)
track->bitrate = st->codec->bit_rate;
track->track_id = st->id;
track->timescale = st->time_base.den;
- track->duration = av_rescale_rnd(ctx->duration, track->timescale,
- AV_TIME_BASE, AV_ROUND_UP);
+ track->duration = st->duration;
track->is_audio = st->codec->codec_type == AVMEDIA_TYPE_AUDIO;
track->is_video = st->codec->codec_type == AVMEDIA_TYPE_VIDEO;