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)
* qatar/master:
  lavf: Remove a now useless parameter to ffurl_register_protocol

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/allformats.c
libavformat/avio.c
libavformat/url.h

Simple merge
Simple merge
Simple merge