diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-02 15:26:56 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-02 15:26:56 -0300 |
| commit | 45121cbdda00627c9b51b3fd10ea044ebfaa6664 (patch) | |
| tree | d20e44c736e3e31b7ccf18876506a9b19c9767cb | |
| parent | e91f0c4f8b3e81bc63838cc67370a7b13c8d9e78 (diff) | |
| parent | 5d3953a5dcfd5f71391b7f34908517eb6f7e5146 (diff) | |
Merge commit '5d3953a5dcfd5f71391b7f34908517eb6f7e5146'
* commit '5d3953a5dcfd5f71391b7f34908517eb6f7e5146':
matroskaenc: factor ts_offset into block timecode computation
Merged-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavformat/matroskaenc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 17094f82b0..6f094c458c 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2113,6 +2113,8 @@ static void mkv_write_block(AVFormatContext *s, AVIOContext *pb, uint8_t track_number = (mkv->is_dash ? mkv->dash_track_number : (pkt->stream_index + 1)); ebml_master block_group, block_additions, block_more; + ts += mkv->tracks[pkt->stream_index].ts_offset; + av_log(s, AV_LOG_DEBUG, "Writing block at offset %" PRIu64 ", size %d, " "pts %" PRId64 ", dts %" PRId64 ", duration %" PRId64 ", keyframe %d\n", avio_tell(pb), pkt->size, pkt->pts, pkt->dts, pkt->duration, |