Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Oct 2013 16:48:43 +0000 (17:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 30 Oct 2013 16:48:47 +0000 (17:48 +0100)
commit7f019129e1bdeeb7fd0af05dc002b133df530f03
tree75e3953c29f71faab22ae4cffc69e5d8acc405a2
parent94a80e36d307a5fbd8f2df1fa0cf8699bfad0ac9
parent0c5f839693da2276c2da23400f67a67be4ea0af1
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>
libavformat/allformats.c
libavformat/avio.c
libavformat/url.h