]> git.sesse.net Git - ffmpeg/commit
Merge commit '40f74dc87acb3f5bbb51f273790a4a7a64201b16'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 14:18:23 +0000 (15:18 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 14 Nov 2016 14:18:23 +0000 (15:18 +0100)
commit15352568132ce93846466379891d613f9c6d0eaa
tree08dc449370b924019fe57d6e1059906f88967687
parent745a44ee6130358ae185b28e3583ccf573bbb1a2
parent40f74dc87acb3f5bbb51f273790a4a7a64201b16
Merge commit '40f74dc87acb3f5bbb51f273790a4a7a64201b16'

* commit '40f74dc87acb3f5bbb51f273790a4a7a64201b16':
  matroskadec: export CodecDelay

Noop, we already export CodecDelay

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>