From 5d234974932149081262251fa772c1f45825637a Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Wed, 23 Apr 2003 08:56:14 +0000 Subject: * more strict types Originally committed as revision 1815 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/avcodec.h | 2 +- libavformat/avi.h | 3 ++- libavformat/avienc.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4c2ead7d1a..f01a7dec2d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1141,7 +1141,7 @@ int avoption_parse(void* strct, const AVOption* list, const char* opts); */ typedef struct AVCodec { const char *name; - int type; + enum CodecType type; int id; int priv_data_size; int (*init)(AVCodecContext *); diff --git a/libavformat/avi.h b/libavformat/avi.h index 193c5812c3..73a43032d4 100644 --- a/libavformat/avi.h +++ b/libavformat/avi.h @@ -27,4 +27,5 @@ extern const CodecTag codec_bmp_tags[]; extern const CodecTag codec_wav_tags[]; unsigned int codec_get_tag(const CodecTag *tags, int id); -int codec_get_id(const CodecTag *tags, unsigned int tag); +enum CodecID; +enum CodecID codec_get_id(const CodecTag *tags, unsigned int tag); diff --git a/libavformat/avienc.c b/libavformat/avienc.c index f7017a1bbd..2194af0f57 100644 --- a/libavformat/avienc.c +++ b/libavformat/avienc.c @@ -185,14 +185,14 @@ static unsigned int codec_get_asf_tag(const CodecTag *tags, int id) return 0; } -int codec_get_id(const CodecTag *tags, unsigned int tag) +enum CodecID codec_get_id(const CodecTag *tags, unsigned int tag) { while (tags->id != 0) { if (tags->tag == tag) return tags->id; tags++; } - return 0; + return CODEC_ID_NONE; } unsigned int codec_get_bmp_tag(int id) -- cgit v1.2.3