virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Merge commit '5cf6bda6e2eae496e8eb2bb06c96852d59a58b8a'

Browse Source 
* commit '5cf6bda6e2eae496e8eb2bb06c96852d59a58b8a':
  sidxindex: Don't adjust the Period start time depending on the track start time

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-03 04:51:40 +01:00
commit e566667d8f
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/sidxindex.c
View File

@ -252,7 +252,6 @@ static int output_mpd(struct Tracks *tracks, const char *filename)
int nb_tracks_buf[2] = { 0 }; int nb_tracks_buf[2] = { 0 };
int *nb_tracks; int *nb_tracks;
int set, nb_sets; int set, nb_sets;
int64_t latest_start = 0;
if (!tracks->multiple_tracks_per_file) { if (!tracks->multiple_tracks_per_file) {
adaptation_sets = adaptation_sets_buf; adaptation_sets = adaptation_sets_buf;
@ -299,17 +298,7 @@ static int output_mpd(struct Tracks *tracks, const char *filename)
fprintf(out, "\"\n"); fprintf(out, "\"\n");
fprintf(out, "\tminBufferTime=\"PT5S\">\n"); fprintf(out, "\tminBufferTime=\"PT5S\">\n");
for (i = 0; i < tracks->nb_tracks; i++) { fprintf(out, "\t<Period start=\"PT0.0S\">\n");
int64_t start = av_rescale_rnd(tracks->tracks[i]->earliest_presentation,
AV_TIME_BASE,
tracks->tracks[i]->earliest_presentation_timescale,
AV_ROUND_UP);
latest_start = FFMAX(start, latest_start);
}
fprintf(out, "\t<Period start=\"");
write_time(out, latest_start, 3, AV_ROUND_UP);
fprintf(out, "\">\n");
for (set = 0; set < nb_sets; set++) { for (set = 0; set < nb_sets; set++) {
if (nb_tracks[set] == 0) if (nb_tracks[set] == 0)