* more strict types

Originally committed as revision 1815 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Zdenek Kabelac 22 years ago
parent e738cee9c4
commit 5d23497493
  1. 2
      libavcodec/avcodec.h
  2. 3
      libavformat/avi.h
  3. 4
      libavformat/avienc.c

@ -1141,7 +1141,7 @@ int avoption_parse(void* strct, const AVOption* list, const char* opts);
*/ */
typedef struct AVCodec { typedef struct AVCodec {
const char *name; const char *name;
int type; enum CodecType type;
int id; int id;
int priv_data_size; int priv_data_size;
int (*init)(AVCodecContext *); int (*init)(AVCodecContext *);

@ -27,4 +27,5 @@ extern const CodecTag codec_bmp_tags[];
extern const CodecTag codec_wav_tags[]; extern const CodecTag codec_wav_tags[];
unsigned int codec_get_tag(const CodecTag *tags, int id); 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);

@ -185,14 +185,14 @@ static unsigned int codec_get_asf_tag(const CodecTag *tags, int id)
return 0; 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) { while (tags->id != 0) {
if (tags->tag == tag) if (tags->tag == tag)
return tags->id; return tags->id;
tags++; tags++;
} }
return 0; return CODEC_ID_NONE;
} }
unsigned int codec_get_bmp_tag(int id) unsigned int codec_get_bmp_tag(int id)

Loading…
Cancel
Save