diff options
| author | Martin Storsjö <martin@martin.st> | 2013-10-29 22:52:09 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-10-30 09:53:48 +0200 |
| commit | 0c5f839693da2276c2da23400f67a67be4ea0af1 (patch) | |
| tree | b264fc3c396e9c2fa51d358dfca86b40fd41e1f5 | |
| parent | 4f2d8968c04ef76bb18df103a1287b864c0e6fe6 (diff) | |
| download | ffmpeg-0c5f839693da2276c2da23400f67a67be4ea0af1.tar.gz | |
lavf: Remove a now useless parameter to ffurl_register_protocol
This was added in 9b07a2dc02e9 as an ABI hack to allow older
code built with lavf 52 to register protocols even if the size
of the URLProtocol struct was increased. Later, registering
protocols from outside of lavf was removed and this workaround
isn't needed any longer since lavf 53.
This removes an unchecked malloc and a memory leak for the cases
when this workaround actually was used - which it hasn't since
lavf 53.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -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 |