highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avio: deprecate av_protocol_next().

Browse Source
This commit is contained in:
Anton Khirnov
2011-04-04 20:28:58 +02:00
parent f8270bbf8c
commit cdc6a87f19
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cmdutils.c
View File

@ -653,20 +653,16 @@ void show_bsfs(void)
void show_protocols(void) void show_protocols(void)
{ {
URLProtocol *up=NULL; void *opaque = NULL;
const char *name;
printf("Supported file protocols:\n" printf("Supported file protocols:\n"
"I.. = Input supported\n" "Input:\n");
".O. = Output supported\n" while ((name = avio_enum_protocols(&opaque, 0)))
"..S = Seek supported\n" printf("%s\n", name);
"FLAGS NAME\n" printf("Output:\n");
"----- \n"); while ((name = avio_enum_protocols(&opaque, 1)))
while((up = av_protocol_next(up))) printf("%s\n", name);
printf("%c%c%c %s\n",
up->url_read ? 'I' : '.',
up->url_write ? 'O' : '.',
up->url_seek ? 'S' : '.',
up->name);
} }
void show_filters(void) void show_filters(void)

2
libavformat/avio.c
View File

@ -51,11 +51,13 @@ static int default_interrupt_cb(void);
URLProtocol *first_protocol = NULL; URLProtocol *first_protocol = NULL;
int (*url_interrupt_cb)(void) = default_interrupt_cb; int (*url_interrupt_cb)(void) = default_interrupt_cb;
#if FF_API_OLD_AVIO
URLProtocol *av_protocol_next(URLProtocol *p) URLProtocol *av_protocol_next(URLProtocol *p)
{ {
if(p) return p->next; if(p) return p->next;
else return first_protocol; else return first_protocol;
} }
#endif
const char *avio_enum_protocols(void **opaque, int output) const char *avio_enum_protocols(void **opaque, int output)
{ {

4
libavformat/avio.h
View File

@ -170,12 +170,14 @@ extern URLProtocol *first_protocol;
extern URLInterruptCB *url_interrupt_cb; extern URLInterruptCB *url_interrupt_cb;
#endif #endif
#if FF_API_OLD_AVIO
/** /**
* If protocol is NULL, returns the first registered protocol, * If protocol is NULL, returns the first registered protocol,
* if protocol is non-NULL, returns the next registered protocol after protocol, * if protocol is non-NULL, returns the next registered protocol after protocol,
* or NULL if protocol is the last one. * or NULL if protocol is the last one.
*/ */
URLProtocol *av_protocol_next(URLProtocol *p); attribute_deprecated URLProtocol *av_protocol_next(URLProtocol *p);
#endif
#if FF_API_REGISTER_PROTOCOL #if FF_API_REGISTER_PROTOCOL
/** /**