generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavc: add const to AVCodec* function parameters.

Browse Source
This commit is contained in:
Anton Khirnov 2012-08-11 14:50:36 +02:00
parent 15c71dfd03
commit 0a0f19b577
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/avcodec.h
View File

@ -1298,7 +1298,7 @@ typedef struct AVCodecContext {
int log_level_offset; int log_level_offset;
enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */ enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
struct AVCodec *codec; const struct AVCodec *codec;
char codec_name[32]; char codec_name[32];
enum AVCodecID codec_id; /* see AV_CODEC_ID_xxx */ enum AVCodecID codec_id; /* see AV_CODEC_ID_xxx */
@ -3150,7 +3150,7 @@ typedef struct AVSubtitle {
* if c is non-NULL, returns the next registered codec after c, * if c is non-NULL, returns the next registered codec after c,
* or NULL if c is the last one. * or NULL if c is the last one.
*/ */
AVCodec *av_codec_next(AVCodec *c); AVCodec *av_codec_next(const AVCodec *c);
/** /**
* Return the LIBAVCODEC_VERSION_INT constant. * Return the LIBAVCODEC_VERSION_INT constant.
@ -3204,7 +3204,7 @@ void avcodec_register_all(void);
* @return An AVCodecContext filled with default values or NULL on failure. * @return An AVCodecContext filled with default values or NULL on failure.
* @see avcodec_get_context_defaults * @see avcodec_get_context_defaults
*/ */
AVCodecContext *avcodec_alloc_context3(AVCodec *codec); AVCodecContext *avcodec_alloc_context3(const AVCodec *codec);
/** /**
* Set the fields of the given AVCodecContext to default values corresponding * Set the fields of the given AVCodecContext to default values corresponding
@ -3215,7 +3215,7 @@ AVCodecContext *avcodec_alloc_context3(AVCodec *codec);
* If codec is non-NULL, it is illegal to call avcodec_open2() with a * If codec is non-NULL, it is illegal to call avcodec_open2() with a
* different codec on this AVCodecContext. * different codec on this AVCodecContext.
*/ */
int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec); int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec);
/** /**
* Get the AVClass for AVCodecContext. It can be used in combination with * Get the AVClass for AVCodecContext. It can be used in combination with
@ -3290,7 +3290,7 @@ void avcodec_get_frame_defaults(AVFrame *pic);
* @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(), * @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(),
* av_dict_set(), av_opt_find(). * av_dict_set(), av_opt_find().
*/ */
int avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options); int avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options);
/** /**
* Close a given AVCodecContext and free all the data associated with it * Close a given AVCodecContext and free all the data associated with it
@ -4527,12 +4527,12 @@ int avcodec_is_open(AVCodecContext *s);
/** /**
* @return a non-zero number if codec is an encoder, zero otherwise * @return a non-zero number if codec is an encoder, zero otherwise
*/ */
int av_codec_is_encoder(AVCodec *codec); int av_codec_is_encoder(const AVCodec *codec);
/** /**
* @return a non-zero number if codec is a decoder, zero otherwise * @return a non-zero number if codec is a decoder, zero otherwise
*/ */
int av_codec_is_decoder(AVCodec *codec); int av_codec_is_decoder(const AVCodec *codec);
/** /**
* @return descriptor for given codec ID or NULL if no descriptor exists. * @return descriptor for given codec ID or NULL if no descriptor exists.

6
libavcodec/options.c
View File

@ -77,7 +77,8 @@ static const AVClass av_codec_context_class = {
.child_class_next = codec_child_class_next, .child_class_next = codec_child_class_next,
}; };
int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec){ int avcodec_get_context_defaults3(AVCodecContext *s, const AVCodec *codec)
{
memset(s, 0, sizeof(AVCodecContext)); memset(s, 0, sizeof(AVCodecContext));
s->av_class = &av_codec_context_class; s->av_class = &av_codec_context_class;
@ -122,7 +123,8 @@ int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec){
return 0; return 0;
} }
AVCodecContext *avcodec_alloc_context3(AVCodec *codec){ AVCodecContext *avcodec_alloc_context3(const AVCodec *codec)
{
AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext)); AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext));
if(avctx==NULL) return NULL; if(avctx==NULL) return NULL;

11
libavcodec/utils.c
View File

@ -96,7 +96,8 @@ void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size)
/* encoder management */ /* encoder management */
static AVCodec *first_avcodec = NULL; static AVCodec *first_avcodec = NULL;
AVCodec *av_codec_next(AVCodec *c){ AVCodec *av_codec_next(const AVCodec *c)
{
if(c) return c->next; if(c) return c->next;
else return first_avcodec; else return first_avcodec;
} }
@ -112,12 +113,12 @@ static void avcodec_init(void)
ff_dsputil_static_init(); ff_dsputil_static_init();
} }
int av_codec_is_encoder(AVCodec *codec) int av_codec_is_encoder(const AVCodec *codec)
{ {
return codec && (codec->encode || codec->encode2); return codec && (codec->encode || codec->encode2);
} }
int av_codec_is_decoder(AVCodec *codec) int av_codec_is_decoder(const AVCodec *codec)
{ {
return codec && codec->decode; return codec && codec->decode;
} }
@ -627,7 +628,7 @@ AVFrame *avcodec_alloc_frame(void){
return pic; return pic;
} }
int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVDictionary **options) int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *codec, AVDictionary **options)
{ {
int ret = 0; int ret = 0;
AVDictionary *tmp = NULL; AVDictionary *tmp = NULL;
@ -1508,7 +1509,7 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode)
{ {
const char *codec_name; const char *codec_name;
const char *profile = NULL; const char *profile = NULL;
AVCodec *p; const AVCodec *p;
char buf1[32]; char buf1[32];
int bitrate; int bitrate;
AVRational display_aspect_ratio; AVRational display_aspect_ratio;