diff options
| author | Anton Khirnov <anton@khirnov.net> | 2016-02-19 10:49:10 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2016-02-22 11:35:46 +0100 |
| commit | 0fa00d05911aa8043ecad8dead4a73cab7faadf6 (patch) | |
| tree | 21c29596c5dec151bd893705b27d2c6d5d165eb5 /libavformat | |
| parent | 2758cdedfb7ac61f8b5e4861f99218b6fd43491d (diff) | |
| download | ffmpeg-0fa00d05911aa8043ecad8dead4a73cab7faadf6.tar.gz | |
lavf: move avio_enum_protocols() to protocols.c
It's a more appropriate place for it.
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avio.c | 15 | ||||
| -rw-r--r-- | libavformat/protocols.c | 15 |
2 files changed, 15 insertions, 15 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index 00c111a059..3ead41ae86 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 a97aa1008d..c1e9989a0a 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); +} |