diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-27 01:57:34 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-27 01:57:34 +0200 |
| commit | 0a7f3af27fa29f2eb9cab0de22703d9c26d12b2c (patch) | |
| tree | 62ce5239426c430905853811a0664351fc55ccee /libavcodec/avcodec.h | |
| parent | d1ce43a3e8fe18e29a334b1a2fda82215f86f2b9 (diff) | |
| parent | 53abe32409f13687c864b3cda077a1aa906a2459 (diff) | |
| download | ffmpeg-0a7f3af27fa29f2eb9cab0de22703d9c26d12b2c.tar.gz | |
Merge commit '53abe32409f13687c864b3cda077a1aa906a2459'
* commit '53abe32409f13687c864b3cda077a1aa906a2459':
avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const
Conflicts:
libavcodec/avcodec.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/avcodec.h')
| -rw-r--r-- | libavcodec/avcodec.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 93ba4d087c..ba1873137d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -4277,7 +4277,7 @@ typedef struct AVCodecParser { struct AVCodecParser *next; } AVCodecParser; -AVCodecParser *av_parser_next(AVCodecParser *c); +AVCodecParser *av_parser_next(const AVCodecParser *c); void av_register_codec_parser(AVCodecParser *parser); AVCodecParserContext *av_parser_init(int codec_id); @@ -5001,7 +5001,7 @@ void av_bitstream_filter_close(AVBitStreamFilterContext *bsf); * This function can be used to iterate over all registered bitstream * filters. */ -AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f); +AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f); /* memory */ @@ -5069,7 +5069,7 @@ void av_register_hwaccel(AVHWAccel *hwaccel); * if hwaccel is non-NULL, returns the next registered hardware accelerator * after hwaccel, or NULL if hwaccel is the last one. */ -AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel); +AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel); /** |