diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-03 01:38:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-03 01:38:58 +0100 |
| commit | 0506f687e8771c2bc3cddf4c9bc3ad77e37f69f2 (patch) | |
| tree | 9095cbd6fbdd8a0f5b7264bd85ed7276a20b95e8 /libavformat/movenc.c | |
| parent | 68a06a244c06cd7caa6ed724c7cfbd2dbd7725b8 (diff) | |
| parent | c725faebda9a516766d94c33b07972ab0f70cf93 (diff) | |
Merge commit 'c725faebda9a516766d94c33b07972ab0f70cf93'
* commit 'c725faebda9a516766d94c33b07972ab0f70cf93':
movenc: Use start_dts/cts instead of cluster[0] for writing edit lists
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 7f6f70a26c..946770dd03 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -2231,8 +2231,8 @@ static int mov_write_edts_tag(AVIOContext *pb, MOVMuxContext *mov, track->timescale, AV_ROUND_UP); int version = duration < INT32_MAX ? 0 : 1; int entry_size, entry_count, size; - int64_t delay, start_ct = track->cluster[0].cts; - delay = av_rescale_rnd(track->cluster[0].dts + start_ct, MOV_TIMESCALE, + int64_t delay, start_ct = track->start_cts; + delay = av_rescale_rnd(track->start_dts + start_ct, MOV_TIMESCALE, track->timescale, AV_ROUND_DOWN); version |= delay < INT32_MAX ? 0 : 1; @@ -2268,8 +2268,8 @@ static int mov_write_edts_tag(AVIOContext *pb, MOVMuxContext *mov, * special meaning. Normally start_ct should end up positive or zero * here, but use FFMIN in case dts is a a small positive integer * 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); - start_ct = -FFMIN(track->cluster[0].dts, 0); + av_assert0(av_rescale_rnd(track->start_dts, MOV_TIMESCALE, track->timescale, AV_ROUND_DOWN) <= 0); + start_ct = -FFMIN(track->start_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. */ @@ -2396,8 +2396,7 @@ static int mov_write_trak_tag(AVIOContext *pb, MOVMuxContext *mov, av_assert2(mov->use_editlist >= 0); - - if (track->entry) { + if (track->start_dts != AV_NOPTS_VALUE) { if (mov->use_editlist) mov_write_edts_tag(pb, mov, track); // PSP Movies and several other cases require edts box else if ((track->entry && track->cluster[0].dts) || track->mode == MODE_PSP || is_clcp_track(track)) |