Merge commit '9286de045968ad456d4e752651eec22de5e89060'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 09:03:32 +0000 (11:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 20 Apr 2015 09:03:32 +0000 (11:03 +0200)
commit4d50d53a6d604043b1020945f603a8adfc6a67cc
tree4c76be5d0ba5ab7d7a043fe7eb4228b6f32b033a
parent82d9c4e5789cefc35567e9e5e2c06c03a070f605
parent9286de045968ad456d4e752651eec22de5e89060
Merge commit '9286de045968ad456d4e752651eec22de5e89060'

* commit '9286de045968ad456d4e752651eec22de5e89060':
  mov: Double-check that alias path is not an absolute path

Conflicts:
libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/mov.c