Commit 694f9ab1 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'f1840b07'

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

Conflicts:
	libavformat/mov.c

See: c9c7263eMerged-by: 's avatarMichael Niedermayer <michael@niedermayer.cc>
parents 441d5a70 f1840b07
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment