]> git.sesse.net Git - ffmpeg/commit
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)
commitc8c402201ad99b0ea8bfe717fef4621d97b85762
treeb9a951c7ef240f0aeb0512a3147d6d30364ca388
parent9c4af99583a11354c005f10d095232ff1a4276c4
parentf126365cdad6327e6def8ceb918eaf538fbb97b3
Merge commit 'f126365cdad6327e6def8ceb918eaf538fbb97b3'

* commit 'f126365cdad6327e6def8ceb918eaf538fbb97b3':
  mov: Fix parsing short loci

This commit is a noop, see 50393bce31a5618f5125aaaf97bb69886fc4261d

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