[FFmpeg-cvslog] Merge commit 'f126365cdad6327e6def8ceb918eaf538fbb97b3'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Fri Jun 24 10:49:05 2016 +0200| [c8c402201ad99b0ea8bfe717fef4621d97b85762] | committer: Clément Bœsch

Merge commit 'f126365cdad6327e6def8ceb918eaf538fbb97b3'

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

This commit is a noop, see 50393bce31a5618f5125aaaf97bb69886fc4261d

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8c402201ad99b0ea8bfe717fef4621d97b85762
---