virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge commit '95ee4e2ce774e0339632d067161596bf3dadfc72'

Browse Source 
* commit '95ee4e2ce774e0339632d067161596bf3dadfc72':
  movenc: Add some comments explaining subtle details in writing the edit lists

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-10-12 22:48:17 +02:00
parent 031285dedf 95ee4e2ce7
commit 687cc836ea
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/movenc.c
View File

@@ -2211,6 +2211,11 @@ static int mov_write_edts_tag(AVIOContext *pb, MOVTrack *track)
avio_wb32(pb, entry_count); avio_wb32(pb, entry_count);
if (delay > 0) { /* add an empty edit to delay presentation */ if (delay > 0) { /* add an empty edit to delay presentation */
/* In the positive delay case, the delay includes the cts
* offset, and the second edit list entry below trims out
* the same amount from the actual content. This makes sure
* that the offsetted last sample is included in the edit
* list duration as well. */
if (version == 1) { if (version == 1) {
avio_wb64(pb, delay); avio_wb64(pb, delay);
avio_wb64(pb, -1); avio_wb64(pb, -1);
@@ -2226,6 +2231,9 @@ static int mov_write_edts_tag(AVIOContext *pb, MOVTrack *track)
* rounded to 0 when represented in MOV_TIMESCALE units. */ * rounded to 0 when represented in MOV_TIMESCALE units. */
av_assert0(av_rescale_rnd(track->cluster[0].dts, MOV_TIMESCALE, track->timescale, AV_ROUND_DOWN) <= 0); av_assert0(av_rescale_rnd(track->cluster[0].dts, MOV_TIMESCALE, track->timescale, AV_ROUND_DOWN) <= 0);
start_ct = -FFMIN(track->cluster[0].dts, 0); start_ct = -FFMIN(track->cluster[0].dts, 0);
/* Note, this delay is calculated from the pts of the first sample,
* ensuring that we don't reduce the duration for cases with
* dts<0 pts=0. */
duration += delay; duration += delay;
} }