Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

lavf: move avio_enum_protocols() to protocols.c

Browse source 
It's a more appropriate place for it.
This commit is contained in:
Anton Khirnov 2016-02-19 10:49:10 +01:00
parent 2758cdedfb
commit 0fa00d0591
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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, static int url_alloc_for_protocol(URLContext **puc, const URLProtocol *up,
const char *filename, int flags, const char *filename, int flags,
const AVIOInterruptCB *int_cb) const AVIOInterruptCB *int_cb)

15
libavformat/protocols.c
View file

@ -162,3 +162,18 @@ const URLProtocol *ff_url_protocols[] = {
#endif #endif
NULL, 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);
}