]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 745a44e 40f74dc)
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)
* commit '40f74dc87acb3f5bbb51f273790a4a7a64201b16':
  matroskadec: export CodecDelay

Noop, we already export CodecDelay

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.