diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index d148d699c51debf3dcb46f923658e1cf288da85d..263ed0e6c2d19bc13db458d4fca577d1dd1fcc64 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 afa5cb426372d372aa668cb0fbf9d04e3373b1d2..503baaae73663f952876895ff79f93a3f615d22b 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 be8b592e26005e462aca00e9a329cbdebb81ce0d..93bca1d08dfdbc59c13f6ee19f7610a2c1da2746 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 f927b260f7bec3a160774725dd528d2bea03f073..29db2d51e2482fbf87f3e2a6c00e25e6f58fe104 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 4e51407fead574326183cd6ab8bbdccc519db071..fa8d5838c486877c388b697baa703f7aa97667ff 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 786bfcf0fb0bf384597965b103c32cb7e2d658ae..06ea76a5dab4e3d3edecd6ca8f6711b0297a7426 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 c6a433a230edc4a7d72daddc118a49fca12f44bd..023b2ca5c56d626897e895a479c48faca36042fd 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 73e6aa59beb8395459915f296c038733b9f9af58..580ac689aa849b35b5dbbb24a2ab0eec1b8566ce 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 df94c225c6096d8fa48cbc7262162c052999c23c..9126e404cf30cfbd55cc2817195e7df0818bc9ee 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 1f2c7eb1803524aac4e5e2efaa9067de60af3a3b..5bed51e3c09d12b0100a73819abb42deaefeaf14 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++) {