]> git.sesse.net Git - ffmpeg/commitdiff
Merge commit 'f126365cdad6327e6def8ceb918eaf538fbb97b3'
authorClément Bœsch <clement@stupeflix.com>
Fri, 24 Jun 2016 08:49:05 +0000 (10:49 +0200)
committerClément Bœsch <clement@stupeflix.com>
Fri, 24 Jun 2016 08:49:05 +0000 (10:49 +0200)
* commit 'f126365cdad6327e6def8ceb918eaf538fbb97b3':
  mov: Fix parsing short loci

This commit is a noop, see 50393bce31a5618f5125aaaf97bb69886fc4261d

Merged-by: Clément Bœsch <clement@stupeflix.com>

Trivial merge