-
Michael Niedermayer authored
* commit '9286de04': mov: Double-check that alias path is not an absolute path Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
4d50d53a
* commit '9286de04': mov: Double-check that alias path is not an absolute path Conflicts: libavformat/mov.c Merged-by: Michael Niedermayer <michaelni@gmx.at>