RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-02 04:52:09 +00:00
Code Issues Projects Releases Wiki Activity

ismindex: Calculate the file duration among the included tracks

Browse Source 
If the input file contains other tracks (non video/audio) that
aren't included in ismindex, the global file duration as returned
by libavformat might not be equal to the maximum of the duration
of the actual included tracks.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2013-10-04 10:12:07 +03:00
parent d347a7b248
commit 583a287f6f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/ismindex.c
View File

@ -292,8 +292,6 @@ static int handle_file(struct Tracks *tracks, const char *file, int split)
fprintf(stderr, "No streams found in %s\n", file); fprintf(stderr, "No streams found in %s\n", file);
goto fail; goto fail;
} }
if (!tracks->duration)
tracks->duration = ctx->duration;
for (i = 0; i < ctx->nb_streams; i++) { for (i = 0; i < ctx->nb_streams; i++) {
struct Track **temp; struct Track **temp;
@ -332,6 +330,10 @@ static int handle_file(struct Tracks *tracks, const char *file, int split)
continue; continue;
} }
tracks->duration = FFMAX(tracks->duration,
av_rescale_rnd(track->duration, AV_TIME_BASE,
track->timescale, AV_ROUND_UP));
if (track->is_audio) { if (track->is_audio) {
if (tracks->audio_track < 0) if (tracks->audio_track < 0)
tracks->audio_track = tracks->nb_tracks; tracks->audio_track = tracks->nb_tracks;