Module: libav Branch: master Commit: 0fa00d05911aa8043ecad8dead4a73cab7faadf6
Author: Anton Khirnov <[email protected]> Committer: Anton Khirnov <[email protected]> Date: Fri Feb 19 10:49:10 2016 +0100 lavf: move avio_enum_protocols() to protocols.c It's a more appropriate place for it. --- libavformat/avio.c | 15 --------------- libavformat/protocols.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/libavformat/avio.c b/libavformat/avio.c index 00c111a..3ead41a 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -79,21 +79,6 @@ const AVClass ffurl_context_class = { }; /*@}*/ -const char *avio_enum_protocols(void **opaque, int output) -{ - const URLProtocol **p = *opaque; - - p = p ? p + 1 : ff_url_protocols; - *opaque = p; - if (!*p) { - *opaque = NULL; - return NULL; - } - if ((output && (*p)->url_write) || (!output && (*p)->url_read)) - return (*p)->name; - return avio_enum_protocols(opaque, output); -} - static int url_alloc_for_protocol(URLContext **puc, const URLProtocol *up, const char *filename, int flags, const AVIOInterruptCB *int_cb) diff --git a/libavformat/protocols.c b/libavformat/protocols.c index a97aa10..c1e9989 100644 --- a/libavformat/protocols.c +++ b/libavformat/protocols.c @@ -162,3 +162,18 @@ const URLProtocol *ff_url_protocols[] = { #endif NULL, }; + +const char *avio_enum_protocols(void **opaque, int output) +{ + const URLProtocol **p = *opaque; + + p = p ? p + 1 : ff_url_protocols; + *opaque = p; + if (!*p) { + *opaque = NULL; + return NULL; + } + if ((output && (*p)->url_write) || (!output && (*p)->url_read)) + return (*p)->name; + return avio_enum_protocols(opaque, output); +} _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
