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/format.c | |
| 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/format.c')
| -rw-r--r-- | libavformat/format.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/format.c b/libavformat/format.c index 95060f373d..5545d07979 100644 --- a/libavformat/format.c +++ b/libavformat/format.c @@ -36,7 +36,7 @@ static AVOutputFormat *first_oformat = NULL; static AVInputFormat **last_iformat = &first_iformat; static AVOutputFormat **last_oformat = &first_oformat; -AVInputFormat *av_iformat_next(AVInputFormat *f) +AVInputFormat *av_iformat_next(const AVInputFormat *f) { if (f) return f->next; @@ -44,7 +44,7 @@ AVInputFormat *av_iformat_next(AVInputFormat *f) return first_iformat; } -AVOutputFormat *av_oformat_next(AVOutputFormat *f) +AVOutputFormat *av_oformat_next(const AVOutputFormat *f) { if (f) return f->next; |