Mercurial > libavformat.hg
comparison riff.h @ 4129:0116c7e7e3ef libavformat
Fix two identical warnings when compiling riff.c and nuv.c with icc:
warning #188: enumerated type mixed with another type
author | cehoyos |
---|---|
date | Mon, 22 Dec 2008 22:12:44 +0000 |
parents | 549a09cf23fe |
children | 49c1d3b27727 |
comparison
equal
deleted
inserted
replaced
4128:e51ace85da6c | 4129:0116c7e7e3ef |
---|---|
39 unsigned int tag; | 39 unsigned int tag; |
40 } AVCodecTag; | 40 } AVCodecTag; |
41 | 41 |
42 void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf); | 42 void put_bmp_header(ByteIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf); |
43 int put_wav_header(ByteIOContext *pb, AVCodecContext *enc); | 43 int put_wav_header(ByteIOContext *pb, AVCodecContext *enc); |
44 int wav_codec_get_id(unsigned int tag, int bps); | 44 enum CodecID wav_codec_get_id(unsigned int tag, int bps); |
45 void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size); | 45 void get_wav_header(ByteIOContext *pb, AVCodecContext *codec, int size); |
46 | 46 |
47 extern const AVCodecTag codec_bmp_tags[]; | 47 extern const AVCodecTag codec_bmp_tags[]; |
48 extern const AVCodecTag codec_wav_tags[]; | 48 extern const AVCodecTag codec_wav_tags[]; |
49 | 49 |