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

Merge commit '5c337353a2546416631a87de4881850d99141c39' 

* commit '5c337353a2546416631a87de4881850d99141c39':
  movenc: Move sidx edit list timestamp adjustment into a block

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-19 13:26:44 +01:00
parent 3602782429 5c337353a2
commit 25d7e3ad59
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/movenc.c
View File

@ -3652,15 +3652,15 @@ static int mov_write_sidx_tag(AVIOContext *pb,
duration = track->start_dts + track->track_duration -
track->cluster[0].dts;
starts_with_SAP = track->cluster[0].flags & MOV_SYNC_SAMPLE;
// pts<0 should be cut away using edts
if (presentation_time < 0)
presentation_time = 0;
} else {
entries = track->nb_frag_info;
presentation_time = track->frag_info[0].time;
}
// pts<0 should be cut away using edts
if (presentation_time < 0)
presentation_time = 0;
avio_wb32(pb, 0); /* size */
ffio_wfourcc(pb, "sidx");
avio_w8(pb, 1); /* version */