[FFmpeg-cvslog] Merge commit '9286de045968ad456d4e752651eec22de5e89060'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Apr 20 11:03:32 2015 +0200| [4d50d53a6d604043b1020945f603a8adfc6a67cc] | committer: Michael Niedermayer

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 at gmx.at>

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