[generic] Abort if user passes in URL "url" (#2942)
Merge branch 'master' of github.com:rg3/youtube-dl