diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2008-11-08 18:37:03 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2008-11-08 18:37:03 +0000 |
| commit | 15545a095a01b981a5d691d7bd6081b8b1b7d209 (patch) | |
| tree | 6cbcd71108738f6e2c82938c7ee73633d7d647b1 | |
| parent | 502ecc97af848318d305558f6dc4be16b6af3dd5 (diff) | |
Fix argument constness for the av_codec_get_id() and
av_codec_get_tag() functions, making them take in input a constant
array, since they're not supposed to change it. Fix some warnings.
Originally committed as revision 15795 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/avformat.h | 4 | ||||
| -rw-r--r-- | libavformat/utils.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 78e78788aa..acdcec4251 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -694,8 +694,8 @@ void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload); void av_register_all(void); /** codec tag <-> codec id */ -enum CodecID av_codec_get_id(const struct AVCodecTag **tags, unsigned int tag); -unsigned int av_codec_get_tag(const struct AVCodecTag **tags, enum CodecID id); +enum CodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag); +unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum CodecID id); /* media file input */ diff --git a/libavformat/utils.c b/libavformat/utils.c index e23eb88c3d..7a91b0f009 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1938,7 +1938,7 @@ enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag) return CODEC_ID_NONE; } -unsigned int av_codec_get_tag(const AVCodecTag *tags[4], enum CodecID id) +unsigned int av_codec_get_tag(const AVCodecTag * const *tags, enum CodecID id) { int i; for(i=0; tags && tags[i]; i++){ @@ -1948,7 +1948,7 @@ unsigned int av_codec_get_tag(const AVCodecTag *tags[4], enum CodecID id) return 0; } -enum CodecID av_codec_get_id(const AVCodecTag *tags[4], unsigned int tag) +enum CodecID av_codec_get_id(const AVCodecTag * const *tags, unsigned int tag) { int i; for(i=0; tags && tags[i]; i++){ |