Merge remote-tracking branch 'qatar/master'

* qatar/master:
  lavf: Remove a now useless parameter to ffurl_register_protocol

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavformat/allformats.c
Simple merge

diff --cc libavformat/avio.c
Simple merge

diff --cc libavformat/url.h
Simple merge