diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-27 02:09:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-27 02:09:41 +0200 |
| commit | 6542e5575f1425ecc9972a1bb7477d03816e40d0 (patch) | |
| tree | 9b836b016e7c9a502a3bb43d77c285deaa4c09bd /libavformat/url.h | |
| parent | 0a7f3af27fa29f2eb9cab0de22703d9c26d12b2c (diff) | |
| parent | ec4f04da1a3462dac429b9d15dee5f027309da15 (diff) | |
| download | ffmpeg-6542e5575f1425ecc9972a1bb7477d03816e40d0.tar.gz | |
Merge commit 'ec4f04da1a3462dac429b9d15dee5f027309da15'
* commit 'ec4f04da1a3462dac429b9d15dee5f027309da15':
avformat: Mark argument in av_{i|o}format_next/ffurl_protocol_next as const
Conflicts:
libavformat/format.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/url.h')
| -rw-r--r-- | libavformat/url.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/url.h b/libavformat/url.h index 712ea0f5b4..c4d16429bf 100644 --- a/libavformat/url.h +++ b/libavformat/url.h @@ -240,7 +240,7 @@ int ff_check_interrupt(AVIOInterruptCB *cb); * * @param prev result of the previous call to this functions or NULL. */ -URLProtocol *ffurl_protocol_next(URLProtocol *prev); +URLProtocol *ffurl_protocol_next(const URLProtocol *prev); /* udp.c */ int ff_udp_set_remote_url(URLContext *h, const char *uri); |