Merge commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 12:40:19 +0000 (14:40 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 12:40:53 +0000 (14:40 +0200)
commit694f9ab1ef141cf80de8f81db6955a17606182af
tree8bce92071141b185bcd67abbb0cc1cf9429340b5
parent441d5a7084b56fd9874daede2ef90356b3bf9d16
parentf1840b070dd449ad25e1ebbab463f10863a5e0f1
Merge commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1'

* commit 'f1840b070dd449ad25e1ebbab463f10863a5e0f1':
  Revert "mov: Double-check that alias path is not an absolute path"

Conflicts:
libavformat/mov.c

See: c9c7263e5820c957598643216c42be9b1c4f2d2b
Merged-by: Michael Niedermayer <michael@niedermayer.cc>