From bb2f13c19ff8ff6e5f1c67a5ae53991e64609490 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 7 Aug 2012 23:57:21 +0200 Subject: [PATCH] rename missed CodecID to AVCodecID Signed-off-by: Michael Niedermayer --- libavcodec/avcodec.h | 2 +- libavcodec/crystalhd.c | 2 +- libavdevice/dshow.c | 4 ++-- libavdevice/openal-dec.c | 2 +- libavformat/cafenc.c | 4 ++-- libavformat/mov.c | 2 +- libavformat/movenc.c | 2 +- libavformat/riff.c | 2 +- libavformat/riff.h | 4 ++-- libavformat/wtvenc.c | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index d148d699c5..263ed0e6c2 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -92,7 +92,7 @@ * If you add a codec ID to this list, add it so that * 1. no value of a existing codec ID changes (that would break ABI), * 2. Give it a value which when taken as ASCII is recognized uniquely by a human as this specific codec. - * This ensures that 2 forks can independently add CodecIDs without producing conflicts. + * This ensures that 2 forks can independently add AVCodecIDs without producing conflicts. */ enum AVCodecID { AV_CODEC_ID_NONE, diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c index afa5cb4263..503baaae73 100644 --- a/libavcodec/crystalhd.c +++ b/libavcodec/crystalhd.c @@ -163,7 +163,7 @@ static const AVOption options[] = { * Helper functions ****************************************************************************/ -static inline BC_MEDIA_SUBTYPE id2subtype(CHDContext *priv, enum CodecID id) +static inline BC_MEDIA_SUBTYPE id2subtype(CHDContext *priv, enum AVCodecID id) { switch (id) { case AV_CODEC_ID_MPEG4: diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index be8b592e26..93bca1d08d 100644 --- a/libavdevice/dshow.c +++ b/libavdevice/dshow.c @@ -92,7 +92,7 @@ static enum PixelFormat dshow_pixfmt(DWORD biCompression, WORD biBitCount) return PIX_FMT_NONE; } -static enum CodecID dshow_codecid(DWORD biCompression) +static enum AVCodecID dshow_codecid(DWORD biCompression) { switch(biCompression) { case MKTAG('d', 'v', 's', 'd'): @@ -639,7 +639,7 @@ error: return ret; } -static enum CodecID waveform_codec_id(enum AVSampleFormat sample_fmt) +static enum AVCodecID waveform_codec_id(enum AVSampleFormat sample_fmt) { switch (sample_fmt) { case AV_SAMPLE_FMT_U8: return AV_CODEC_ID_PCM_U8; diff --git a/libavdevice/openal-dec.c b/libavdevice/openal-dec.c index f927b260f7..29db2d51e2 100644 --- a/libavdevice/openal-dec.c +++ b/libavdevice/openal-dec.c @@ -48,7 +48,7 @@ typedef struct { typedef struct { ALCenum al_fmt; - enum CodecID codec_id; + enum AVCodecID codec_id; int channels; } al_format_info; diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c index 4e51407fea..fa8d5838c4 100644 --- a/libavformat/cafenc.c +++ b/libavformat/cafenc.c @@ -34,7 +34,7 @@ typedef struct { int packets; } CAFContext; -static uint32_t codec_flags(enum CodecID codec_id) { +static uint32_t codec_flags(enum AVCodecID codec_id) { switch (codec_id) { case AV_CODEC_ID_PCM_F32BE: case AV_CODEC_ID_PCM_F64BE: @@ -51,7 +51,7 @@ static uint32_t codec_flags(enum CodecID codec_id) { } } -static uint32_t samples_per_packet(enum CodecID codec_id, int channels) { +static uint32_t samples_per_packet(enum AVCodecID codec_id, int channels) { switch (codec_id) { case AV_CODEC_ID_PCM_S8: case AV_CODEC_ID_PCM_S16LE: diff --git a/libavformat/mov.c b/libavformat/mov.c index 786bfcf0fb..06ea76a5da 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -870,7 +870,7 @@ static int mov_read_fiel(MOVContext *c, AVIOContext *pb, MOVAtom atom) /* FIXME modify qdm2/svq3/h264 decoders to take full atom as extradata */ static int mov_read_extradata(MOVContext *c, AVIOContext *pb, MOVAtom atom, - enum CodecID codec_id) + enum AVCodecID codec_id) { AVStream *st; uint64_t size; diff --git a/libavformat/movenc.c b/libavformat/movenc.c index c6a433a230..023b2ca5c5 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -348,7 +348,7 @@ static int mov_write_esds_tag(AVIOContext *pb, MOVTrack *track) // Basic return update_size(pb, pos); } -static int mov_pcm_le_gt16(enum CodecID codec_id) +static int mov_pcm_le_gt16(enum AVCodecID codec_id) { return codec_id == AV_CODEC_ID_PCM_S24LE || codec_id == AV_CODEC_ID_PCM_S32LE || diff --git a/libavformat/riff.c b/libavformat/riff.c index 73e6aa59be..580ac689aa 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -733,7 +733,7 @@ void ff_get_guid(AVIOContext *s, ff_asf_guid *g) memset(*g, 0, sizeof(*g)); } -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) { int i; for (i = 0; guids[i].id != AV_CODEC_ID_NONE; i++) { diff --git a/libavformat/riff.h b/libavformat/riff.h index df94c225c6..9126e404cf 100644 --- a/libavformat/riff.h +++ b/libavformat/riff.h @@ -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[]; diff --git a/libavformat/wtvenc.c b/libavformat/wtvenc.c index 1f2c7eb180..5bed51e3c0 100644 --- a/libavformat/wtvenc.c +++ b/libavformat/wtvenc.c @@ -113,7 +113,7 @@ static int write_pad(AVIOContext *pb, int size) return 0; } -static const ff_asf_guid *get_codec_guid(enum CodecID id, const AVCodecGuid *av_guid) +static const ff_asf_guid *get_codec_guid(enum AVCodecID id, const AVCodecGuid *av_guid) { int i; for (i = 0; av_guid[i].id != AV_CODEC_ID_NONE; i++) {