diff options
| author | Michael Niedermayer | 2013-10-30 17:48:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer | 2013-10-30 17:48:47 +0100 |
| commit | 7f019129e1bdeeb7fd0af05dc002b133df530f03 (patch) | |
| tree | 75e3953c29f71faab22ae4cffc69e5d8acc405a2 | |
| parent | 94a80e36d307a5fbd8f2df1fa0cf8699bfad0ac9 (diff) | |
| parent | 0c5f839693da2276c2da23400f67a67be4ea0af1 (diff) | |
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>
| -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 20f48c04e8..781e4c488a 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 b297ce89c6..225d9821a0 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 686fe29410..712ea0f5b4 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -226,10 +226,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 |