X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Friff.h;h=9126e404cf30cfbd55cc2817195e7df0818bc9ee;hb=6b3484dcbc6fe6a5f3d0919922790592c9d5a608;hp=67521e25cca3202798076eb94a04f1f5d3082c49;hpb=b0387edd5e766b1032f946d6cdb35b765bb45435;p=ffmpeg

diff --git a/libavformat/riff.h b/libavformat/riff.h
index 67521e25cca..9126e404cf3 100644
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -44,18 +44,18 @@ void ff_end_tag(AVIOContext *pb, int64_t start);
  * bits_per_encoded_sample fields. Does not read extradata.
  * @return codec tag
  */
-int ff_get_bmp_header(AVIOContext *pb, AVStream *st);
+int ff_get_bmp_header(AVIOContext *pb, AVStream *st, unsigned *esize);
 
 void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *tags, int for_asf);
 int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc);
-enum CodecID ff_wav_codec_get_id(unsigned int tag, int bps);
+enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps);
 int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size);
 
 extern const AVCodecTag ff_codec_bmp_tags[];
 extern const AVCodecTag ff_codec_wav_tags[];
 
-unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum CodecID id);
-enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag);
+unsigned int ff_codec_get_tag(const AVCodecTag *tags, enum AVCodecID id);
+enum AVCodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag);
 void ff_parse_specific_params(AVCodecContext *stream, int *au_rate, int *au_ssize, int *au_scale);
 
 typedef uint8_t ff_asf_guid[16];
@@ -75,11 +75,11 @@ static av_always_inline int ff_guidcmp(const void *g1, const void *g2)
 void ff_get_guid(AVIOContext *s, ff_asf_guid *g);
 
 typedef struct {
-    enum CodecID id;
+    enum AVCodecID id;
     ff_asf_guid guid;
 } AVCodecGuid;
 
-enum CodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid);
+enum AVCodecID ff_codec_guid_get_id(const AVCodecGuid *guids, ff_asf_guid guid);
 
 extern const AVCodecGuid ff_codec_wav_guids[];