diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 16:59:47 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-29 17:00:44 +0000 |
| commit | 53025fe1870afb19ee715e80615a1fc497dab13e (patch) | |
| tree | b52e4ceb29f961ff76ea1dd11ffe0fced9e8edcc /libavformat/url.h | |
| parent | 8fd5342463b07fdfe2f6e89620182380c1c10ab8 (diff) | |
| parent | 7d61dc95d741ca134d59b1f34c4e10c4c4e36f56 (diff) | |
| download | ffmpeg-53025fe1870afb19ee715e80615a1fc497dab13e.tar.gz | |
Merge commit '7d61dc95d741ca134d59b1f34c4e10c4c4e36f56'
* commit '7d61dc95d741ca134d59b1f34c4e10c4c4e36f56':
lavf: move urlcontext_child_class_next() to protocols.c
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/url.h')
| -rw-r--r-- | libavformat/url.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/url.h b/libavformat/url.h index 085c24c628..810fd147b1 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -309,6 +309,8 @@ void ff_make_absolute_url(char *buf, int size, const char *base, */ AVIODirEntry *ff_alloc_dir_entry(void); +const AVClass *ff_urlcontext_child_class_next(const AVClass *prev); + extern const URLProtocol *ff_url_protocols[]; #endif /* AVFORMAT_URL_H */ |