eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit '53abe32409'

Browse source 
* commit '53abe32409':
  avcodec: Mark argument in av_{parser|hwaccel|bitstream_filter}_next as const

Conflicts:
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-27 01:57:34 +02:00
commit 0a7f3af27f
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libavcodec/avcodec.h
View file

@ -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);
/**

2
libavcodec/bitstream_filter.c
View file

@ -26,7 +26,7 @@
static AVBitStreamFilter *first_bitstream_filter = NULL;
AVBitStreamFilter *av_bitstream_filter_next(AVBitStreamFilter *f)
AVBitStreamFilter *av_bitstream_filter_next(const AVBitStreamFilter *f)
{
if (f)
return f->next;

2
libavcodec/parser.c
View file

@ -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;

2
libavcodec/utils.c
View file

@ -3401,7 +3401,7 @@ void av_register_hwaccel(AVHWAccel *hwaccel)
last_hwaccel = &hwaccel->next;
}
AVHWAccel *av_hwaccel_next(AVHWAccel *hwaccel)
AVHWAccel *av_hwaccel_next(const AVHWAccel *hwaccel)
{
return hwaccel ? hwaccel->next : first_hwaccel;
}