diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-19 12:38:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-19 12:38:51 +0100 |
| commit | 4631d4bec37cfa6a86693684af7d0f73be7021cb (patch) | |
| tree | 6276253361a460a2306ef7a2bc9c71904af91ae3 /libavformat | |
| parent | 00ad3432e1d80ef73cd9aea3c3b5028aeaad84b6 (diff) | |
| parent | 5cf892d6946b19a87bcd00d6b76ce81f45960fdb (diff) | |
Merge commit '5cf892d6946b19a87bcd00d6b76ce81f45960fdb'
* commit '5cf892d6946b19a87bcd00d6b76ce81f45960fdb':
movenc: Write pts timestamps in tfxd, instead of dts timestamps
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 3477ae0944..795d007887 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -3468,7 +3468,8 @@ static int mov_write_tfxd_tag(AVIOContext *pb, MOVTrack *track) avio_write(pb, uuid, sizeof(uuid)); avio_w8(pb, 1); avio_wb24(pb, 0); - avio_wb64(pb, track->frag_start); + avio_wb64(pb, track->start_dts + track->frag_start + + track->cluster[0].cts); avio_wb64(pb, track->start_dts + track->track_duration - track->cluster[0].dts); |