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>

libavformat/data_uri.c

@@ -109,7 +109,7 @@ static int data_read(URLContext *h, unsigned char *buf, int size)
     return size;
 }
 
-URLProtocol ff_data_protocol = {
+const URLProtocol ff_data_protocol = {
     .name           = "data",
     .url_open       = data_open,
     .url_close      = data_close,