diff options
| -rw-r--r-- | libavformat/allformats.c | 3 | ||||
| -rw-r--r-- | libavformat/avio.c | 7 | ||||
| -rw-r--r-- | libavformat/url.h | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index d72a127612..fe5f582eb4 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -45,8 +45,7 @@ { \ extern URLProtocol ff_##x##_protocol; \ if (CONFIG_##X##_PROTOCOL) \ - ffurl_register_protocol(&ff_##x##_protocol, \ - sizeof(ff_##x##_protocol)); \ + ffurl_register_protocol(&ff_##x##_protocol); \ } void av_register_all(void) diff --git a/libavformat/avio.c b/libavformat/avio.c index e07b23609d..fe42974d3a 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -94,14 +94,9 @@ const char *avio_enum_protocols(void **opaque, int output) return avio_enum_protocols(opaque, output); } -int ffurl_register_protocol(URLProtocol *protocol, int size) +int ffurl_register_protocol(URLProtocol *protocol) { URLProtocol **p; - if (size < sizeof(URLProtocol)) { - URLProtocol *temp = av_mallocz(sizeof(URLProtocol)); - memcpy(temp, protocol, size); - protocol = temp; - } p = &first_protocol; while (*p != NULL) p = &(*p)->next; diff --git a/libavformat/url.h b/libavformat/url.h index c27d0790c8..ff1e21b462 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -224,10 +224,8 @@ int ffurl_shutdown(URLContext *h, int flags); /** * Register the URLProtocol protocol. - * - * @param size the size of the URLProtocol struct referenced */ -int ffurl_register_protocol(URLProtocol *protocol, int size); +int ffurl_register_protocol(URLProtocol *protocol); /** * Check if the user has requested to interrup a blocking function |