Merge commit '5d3953a5dcfd5f71391b7f34908517eb6f7e5146'
authorJames Almer <jamrial@gmail.com>
Mon, 2 Oct 2017 18:26:56 +0000 (15:26 -0300)
committerJames Almer <jamrial@gmail.com>
Mon, 2 Oct 2017 18:26:56 +0000 (15:26 -0300)
commit45121cbdda00627c9b51b3fd10ea044ebfaa6664
treed20e44c736e3e31b7ccf18876506a9b19c9767cb
parente91f0c4f8b3e81bc63838cc67370a7b13c8d9e78
parent5d3953a5dcfd5f71391b7f34908517eb6f7e5146
Merge commit '5d3953a5dcfd5f71391b7f34908517eb6f7e5146'

* commit '5d3953a5dcfd5f71391b7f34908517eb6f7e5146':
  matroskaenc: factor ts_offset into block timecode computation

Merged-by: James Almer <jamrial@gmail.com>
libavformat/matroskaenc.c