diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 16:56:47 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 16:56:47 +0000 |
| commit | 8fd5342463b07fdfe2f6e89620182380c1c10ab8 (patch) | |
| tree | 08e5fc22df38d0c5dc9c91df2544ecd6cabfa43d /libavformat/avio.c | |
| parent | 9c75148e6ebc88a0501e3d0242defb6dbdc3c23d (diff) | |
| parent | 0fa00d05911aa8043ecad8dead4a73cab7faadf6 (diff) | |
| download | ffmpeg-8fd5342463b07fdfe2f6e89620182380c1c10ab8.tar.gz | |
Merge commit '0fa00d05911aa8043ecad8dead4a73cab7faadf6'
* commit '0fa00d05911aa8043ecad8dead4a73cab7faadf6':
lavf: move avio_enum_protocols() to protocols.c
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/avio.c')
| -rw-r--r-- | libavformat/avio.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index bd276f64d6..ef4253cbb9 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -86,21 +86,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) |