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/parser.c | |
| parent | d1ce43a3e8fe18e29a334b1a2fda82215f86f2b9 (diff) | |
| parent | 53abe32409f13687c864b3cda077a1aa906a2459 (diff) | |
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/parser.c')
| -rw-r--r-- | libavcodec/parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/parser.c b/libavcodec/parser.c index 3169e2501f..71449ca3ab 100644 --- a/libavcodec/parser.c +++ b/libavcodec/parser.c @@ -30,7 +30,7 @@ static AVCodecParser *av_first_parser = NULL; -AVCodecParser *av_parser_next(AVCodecParser *p) +AVCodecParser *av_parser_next(const AVCodecParser *p) { if (p) return p->next; |