diff options
| author | Anton Khirnov <anton@khirnov.net> | 2011-04-04 20:28:58 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2011-04-08 17:48:53 +0200 |
| commit | cdc6a87f193b1bf99a640a44374d4f2597118959 (patch) | |
| tree | 60d614de8ade821d48e9218134e614b7111dc763 /libavformat | |
| parent | f8270bbf8ce891cc614a5562c02ce18a50a89f1d (diff) | |
| download | ffmpeg-cdc6a87f193b1bf99a640a44374d4f2597118959.tar.gz | |
avio: deprecate av_protocol_next().
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avio.c | 2 | ||||
| -rw-r--r-- | libavformat/avio.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libavformat/avio.c b/libavformat/avio.c index ab7a7f51ec..ad1f1b40c2 100644 --- a/libavformat/avio.c +++ b/libavformat/avio.c @@ -51,11 +51,13 @@ static int default_interrupt_cb(void); URLProtocol *first_protocol = NULL; int (*url_interrupt_cb)(void) = default_interrupt_cb; +#if FF_API_OLD_AVIO URLProtocol *av_protocol_next(URLProtocol *p) { if(p) return p->next; else return first_protocol; } +#endif const char *avio_enum_protocols(void **opaque, int output) { diff --git a/libavformat/avio.h b/libavformat/avio.h index 9ea138e080..7bb8d175d0 100644 --- a/libavformat/avio.h +++ b/libavformat/avio.h @@ -170,12 +170,14 @@ extern URLProtocol *first_protocol; extern URLInterruptCB *url_interrupt_cb; #endif +#if FF_API_OLD_AVIO /** * If protocol is NULL, returns the first registered protocol, * if protocol is non-NULL, returns the next registered protocol after protocol, * 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 /** |