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/avformat.h | |
| parent | 0a7f3af27fa29f2eb9cab0de22703d9c26d12b2c (diff) | |
| parent | ec4f04da1a3462dac429b9d15dee5f027309da15 (diff) | |
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/avformat.h')
| -rw-r--r-- | libavformat/avformat.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index a9abfbd4c2..3358e2df1f 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1752,14 +1752,14 @@ int avformat_network_deinit(void); * if f is non-NULL, returns the next registered input format after f * or NULL if f is the last one. */ -AVInputFormat *av_iformat_next(AVInputFormat *f); +AVInputFormat *av_iformat_next(const AVInputFormat *f); /** * If f is NULL, returns the first registered output format, * if f is non-NULL, returns the next registered output format after f * or NULL if f is the last one. */ -AVOutputFormat *av_oformat_next(AVOutputFormat *f); +AVOutputFormat *av_oformat_next(const AVOutputFormat *f); /** * Allocate an AVFormatContext. |