Browse Source

lavf: move avio_enum_protocols() to protocols.c

It's a more appropriate place for it.
tags/n3.1
Anton Khirnov 9 years ago
parent
commit
0fa00d0591
2 changed files with 15 additions and 15 deletions
  1. +0
    -15
      libavformat/avio.c
  2. +15
    -0
      libavformat/protocols.c

+ 0
- 15
libavformat/avio.c View File

@@ -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)


+ 15
- 0
libavformat/protocols.c View File

@@ -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);
}

Loading…
Cancel
Save