aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2012-08-11 14:50:36 +0200
committerAnton Khirnov <anton@khirnov.net>2012-08-18 08:48:30 +0200
commit0a0f19b577d54ff2e72cc9a0fe027952db83f332 (patch)
tree7feacb827e9003280811a46e759d5e32a2f9bc96
parent15c71dfd03a699a9ce503bf061d58b88ec49d860 (diff)
downloadffmpeg-0a0f19b577d54ff2e72cc9a0fe027952db83f332.tar.gz
lavc: add const to AVCodec* function parameters.
-rw-r--r--libavcodec/avcodec.h14
-rw-r--r--libavcodec/options.c6
-rw-r--r--libavcodec/utils.c11
3 files changed, 17 insertions, 14 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 2747c7a94b..b6917a0a7d 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1298,7 +1298,7 @@ typedef struct AVCodecContext {
int log_level_offset;
enum AVMediaType codec_type; /* see AVMEDIA_TYPE_xxx */
- struct AVCodec *codec;
+ const struct AVCodec *codec;
char codec_name[32];
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,
* 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.
@@ -3204,7 +3204,7 @@ void avcodec_register_all(void);
* @return An AVCodecContext filled with default values or NULL on failure.
* @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
@@ -3215,7 +3215,7 @@ AVCodecContext *avcodec_alloc_context3(AVCodec *codec);
* If codec is non-NULL, it is illegal to call avcodec_open2() with a
* 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
@@ -3290,7 +3290,7 @@ void avcodec_get_frame_defaults(AVFrame *pic);
* @see avcodec_alloc_context3(), avcodec_find_decoder(), avcodec_find_encoder(),
* 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
@@ -4527,12 +4527,12 @@ int avcodec_is_open(AVCodecContext *s);
/**
* @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
*/
-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.
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 8b1f6a3bc8..25018b9b97 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -77,7 +77,8 @@ static const AVClass av_codec_context_class = {
.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));
s->av_class = &av_codec_context_class;
@@ -122,7 +123,8 @@ int avcodec_get_context_defaults3(AVCodecContext *s, AVCodec *codec){
return 0;
}
-AVCodecContext *avcodec_alloc_context3(AVCodec *codec){
+AVCodecContext *avcodec_alloc_context3(const AVCodec *codec)
+{
AVCodecContext *avctx= av_malloc(sizeof(AVCodecContext));
if(avctx==NULL) return NULL;
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 43a8f67934..b5b0466650 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -96,7 +96,8 @@ void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size)
/* encoder management */
static AVCodec *first_avcodec = NULL;
-AVCodec *av_codec_next(AVCodec *c){
+AVCodec *av_codec_next(const AVCodec *c)
+{
if(c) return c->next;
else return first_avcodec;
}
@@ -112,12 +113,12 @@ static void avcodec_init(void)
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);
}
-int av_codec_is_decoder(AVCodec *codec)
+int av_codec_is_decoder(const AVCodec *codec)
{
return codec && codec->decode;
}
@@ -627,7 +628,7 @@ AVFrame *avcodec_alloc_frame(void){
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;
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 *profile = NULL;
- AVCodec *p;
+ const AVCodec *p;
char buf1[32];
int bitrate;
AVRational display_aspect_ratio;