From bb2f13c19ff8ff6e5f1c67a5ae53991e64609490 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Tue, 7 Aug 2012 23:57:21 +0200
Subject: rename missed CodecID to AVCodecID

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 libavformat/cafenc.c | 4 ++--
 libavformat/mov.c    | 2 +-
 libavformat/movenc.c | 2 +-
 libavformat/riff.c   | 2 +-
 libavformat/riff.h   | 4 ++--
 libavformat/wtvenc.c | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'libavformat')

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++) {
-- 
cgit v1.2.1