rename missed CodecID to AVCodecID

Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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,

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:

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;

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;
 

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:

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;

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 ||

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++) {

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[];
 

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++) {