Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'

This commit also disables the async fate test, because it
used internal APIs in a non-kosher way, which no longer
exists.

* commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d':
  lavf: reorganize URLProtocols

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis
2016-02-29 16:50:39 +00:00
39 changed files with 291 additions and 155 deletions

View File

@@ -365,7 +365,7 @@ static const AVClass libsmbclient_context_class = {
.version = LIBAVUTIL_VERSION_INT,
};
URLProtocol ff_libsmbclient_protocol = {
const URLProtocol ff_libsmbclient_protocol = {
.name = "smb",
.url_open = libsmbc_open,
.url_read = libsmbc_read,