| ... | ... |
@@ -653,20 +653,16 @@ void show_bsfs(void) |
| 653 | 653 |
|
| 654 | 654 |
void show_protocols(void) |
| 655 | 655 |
{
|
| 656 |
- URLProtocol *up=NULL; |
|
| 656 |
+ void *opaque = NULL; |
|
| 657 |
+ const char *name; |
|
| 657 | 658 |
|
| 658 | 659 |
printf("Supported file protocols:\n"
|
| 659 |
- "I.. = Input supported\n" |
|
| 660 |
- ".O. = Output supported\n" |
|
| 661 |
- "..S = Seek supported\n" |
|
| 662 |
- "FLAGS NAME\n" |
|
| 663 |
- "----- \n"); |
|
| 664 |
- while((up = av_protocol_next(up))) |
|
| 665 |
- printf("%c%c%c %s\n",
|
|
| 666 |
- up->url_read ? 'I' : '.', |
|
| 667 |
- up->url_write ? 'O' : '.', |
|
| 668 |
- up->url_seek ? 'S' : '.', |
|
| 669 |
- up->name); |
|
| 660 |
+ "Input:\n"); |
|
| 661 |
+ while ((name = avio_enum_protocols(&opaque, 0))) |
|
| 662 |
+ printf("%s\n", name);
|
|
| 663 |
+ printf("Output:\n");
|
|
| 664 |
+ while ((name = avio_enum_protocols(&opaque, 1))) |
|
| 665 |
+ printf("%s\n", name);
|
|
| 670 | 666 |
} |
| 671 | 667 |
|
| 672 | 668 |
void show_filters(void) |
| ... | ... |
@@ -51,11 +51,13 @@ static int default_interrupt_cb(void); |
| 51 | 51 |
URLProtocol *first_protocol = NULL; |
| 52 | 52 |
int (*url_interrupt_cb)(void) = default_interrupt_cb; |
| 53 | 53 |
|
| 54 |
+#if FF_API_OLD_AVIO |
|
| 54 | 55 |
URLProtocol *av_protocol_next(URLProtocol *p) |
| 55 | 56 |
{
|
| 56 | 57 |
if(p) return p->next; |
| 57 | 58 |
else return first_protocol; |
| 58 | 59 |
} |
| 60 |
+#endif |
|
| 59 | 61 |
|
| 60 | 62 |
const char *avio_enum_protocols(void **opaque, int output) |
| 61 | 63 |
{
|
| ... | ... |
@@ -170,12 +170,14 @@ extern URLProtocol *first_protocol; |
| 170 | 170 |
extern URLInterruptCB *url_interrupt_cb; |
| 171 | 171 |
#endif |
| 172 | 172 |
|
| 173 |
+#if FF_API_OLD_AVIO |
|
| 173 | 174 |
/** |
| 174 | 175 |
* If protocol is NULL, returns the first registered protocol, |
| 175 | 176 |
* if protocol is non-NULL, returns the next registered protocol after protocol, |
| 176 | 177 |
* or NULL if protocol is the last one. |
| 177 | 178 |
*/ |
| 178 |
-URLProtocol *av_protocol_next(URLProtocol *p); |
|
| 179 |
+attribute_deprecated URLProtocol *av_protocol_next(URLProtocol *p); |
|
| 180 |
+#endif |
|
| 179 | 181 |
|
| 180 | 182 |
#if FF_API_REGISTER_PROTOCOL |
| 181 | 183 |
/** |