Commit 15545a09 authored by Stefano Sabatini's avatar Stefano Sabatini

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
parent 502ecc97
...@@ -694,8 +694,8 @@ void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload); ...@@ -694,8 +694,8 @@ void av_pkt_dump_log(void *avcl, int level, AVPacket *pkt, int dump_payload);
void av_register_all(void); void av_register_all(void);
/** codec tag <-> codec id */ /** codec tag <-> codec id */
enum CodecID av_codec_get_id(const struct AVCodecTag **tags, unsigned int tag); enum CodecID av_codec_get_id(const struct AVCodecTag * const *tags, unsigned int tag);
unsigned int av_codec_get_tag(const struct AVCodecTag **tags, enum CodecID id); unsigned int av_codec_get_tag(const struct AVCodecTag * const *tags, enum CodecID id);
/* media file input */ /* media file input */
......
...@@ -1938,7 +1938,7 @@ enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag) ...@@ -1938,7 +1938,7 @@ enum CodecID codec_get_id(const AVCodecTag *tags, unsigned int tag)
return CODEC_ID_NONE; 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; int i;
for(i=0; tags && tags[i]; 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) ...@@ -1948,7 +1948,7 @@ unsigned int av_codec_get_tag(const AVCodecTag *tags[4], enum CodecID id)
return 0; 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; int i;
for(i=0; tags && tags[i]; i++){ for(i=0; tags && tags[i]; i++){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment