Merge commit '704d2bd18be8f134cb9ab19463a3c4eb63233dbd'
authorClément Bœsch <clement@stupeflix.com>
Fri, 24 Jun 2016 08:44:57 +0000 (10:44 +0200)
committerClément Bœsch <clement@stupeflix.com>
Fri, 24 Jun 2016 08:45:57 +0000 (10:45 +0200)
commit9c4af99583a11354c005f10d095232ff1a4276c4
treeb9a951c7ef240f0aeb0512a3147d6d30364ca388
parent6dd80591b88356ac633c9f6dc2d5d1d6a220550a
parent704d2bd18be8f134cb9ab19463a3c4eb63233dbd
Merge commit '704d2bd18be8f134cb9ab19463a3c4eb63233dbd'

* commit '704d2bd18be8f134cb9ab19463a3c4eb63233dbd':
  mov: Print reason of loci parsing failure

See 9e4f0cfc8ff4ab635ea12bdbd8d85d8bb1ba25f9

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