Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

* commit '36ef5369ee9b336febc2c270f8718cec4476cb85':
  Replace all CODEC_ID_* with AV_CODEC_ID_*
  lavc: add AV prefix to codec ids.

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/examples/muxing.c
	ffmpeg.c
	ffprobe.c
	ffserver.c
	libavcodec/8svx.c
	libavcodec/avcodec.h
	libavcodec/dnxhd_parser.c
	libavcodec/dvdsubdec.c
	libavcodec/error_resilience.c
	libavcodec/h263dec.c
	libavcodec/libvorbisenc.c
	libavcodec/mjpeg_parser.c
	libavcodec/mjpegenc.c
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pcm.c
	libavcodec/r210dec.c
	libavcodec/utils.c
	libavcodec/v210dec.c
	libavcodec/version.h
	libavdevice/alsa-audio-dec.c
	libavdevice/bktr.c
	libavdevice/v4l2.c
	libavformat/asfdec.c
	libavformat/asfenc.c
	libavformat/avformat.h
	libavformat/avidec.c
	libavformat/caf.c
	libavformat/electronicarts.c
	libavformat/flacdec.c
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavformat/framecrcenc.c
	libavformat/img2.c
	libavformat/img2dec.c
	libavformat/img2enc.c
	libavformat/ipmovie.c
	libavformat/isom.c
	libavformat/matroska.c
	libavformat/matroskadec.c
	libavformat/matroskaenc.c
	libavformat/mov.c
	libavformat/movenc.c
	libavformat/mp3dec.c
	libavformat/mpeg.c
	libavformat/mpegts.c
	libavformat/mxf.c
	libavformat/mxfdec.c
	libavformat/mxfenc.c
	libavformat/nsvdec.c
	libavformat/nut.c
	libavformat/oggenc.c
	libavformat/pmpdec.c
	libavformat/rawdec.c
	libavformat/rawenc.c
	libavformat/riff.c
	libavformat/sdp.c
	libavformat/utils.c
	libavformat/vocenc.c
	libavformat/wtv.c
	libavformat/xmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 14 insertions, 14 deletions

diff --git a/libavformat/spdifdec.c b/libavformat/spdifdec.c
index e8faa92903..dce33461fe 100644
--- a/libavformat/spdifdec.c
+++ b/libavformat/spdifdec.c
@@ -33,7 +33,7 @@
 static int spdif_get_offset_and_codec(AVFormatContext *s,
                                       enum IEC61937DataType data_type,
                                       const char *buf, int *offset,
-                                      enum CodecID *codec)
+                                      enum AVCodecID *codec)
 {
     AACADTSHeaderInfo aac_hdr;
     GetBitContext gbc;
@@ -41,19 +41,19 @@ static int spdif_get_offset_and_codec(AVFormatContext *s,
     switch (data_type & 0xff) {
     case IEC61937_AC3:
         *offset = AC3_FRAME_SIZE << 2;
-        *codec = CODEC_ID_AC3;
+        *codec = AV_CODEC_ID_AC3;
         break;
     case IEC61937_MPEG1_LAYER1:
         *offset = spdif_mpeg_pkt_offset[1][0];
-        *codec = CODEC_ID_MP1;
+        *codec = AV_CODEC_ID_MP1;
         break;
     case IEC61937_MPEG1_LAYER23:
         *offset = spdif_mpeg_pkt_offset[1][0];
-        *codec = CODEC_ID_MP3;
+        *codec = AV_CODEC_ID_MP3;
         break;
     case IEC61937_MPEG2_EXT:
         *offset = 4608;
-        *codec = CODEC_ID_MP3;
+        *codec = AV_CODEC_ID_MP3;
         break;
     case IEC61937_MPEG2_AAC:
         init_get_bits(&gbc, buf, AAC_ADTS_HEADER_SIZE * 8);
@@ -63,31 +63,31 @@ static int spdif_get_offset_and_codec(AVFormatContext *s,
             return AVERROR_INVALIDDATA;
         }
         *offset = aac_hdr.samples << 2;
-        *codec = CODEC_ID_AAC;
+        *codec = AV_CODEC_ID_AAC;
         break;
     case IEC61937_MPEG2_LAYER1_LSF:
         *offset = spdif_mpeg_pkt_offset[0][0];
-        *codec = CODEC_ID_MP1;
+        *codec = AV_CODEC_ID_MP1;
         break;
     case IEC61937_MPEG2_LAYER2_LSF:
         *offset = spdif_mpeg_pkt_offset[0][1];
-        *codec = CODEC_ID_MP2;
+        *codec = AV_CODEC_ID_MP2;
         break;
     case IEC61937_MPEG2_LAYER3_LSF:
         *offset = spdif_mpeg_pkt_offset[0][2];
-        *codec = CODEC_ID_MP3;
+        *codec = AV_CODEC_ID_MP3;
         break;
     case IEC61937_DTS1:
         *offset = 2048;
-        *codec = CODEC_ID_DTS;
+        *codec = AV_CODEC_ID_DTS;
         break;
     case IEC61937_DTS2:
         *offset = 4096;
-        *codec = CODEC_ID_DTS;
+        *codec = AV_CODEC_ID_DTS;
         break;
     case IEC61937_DTS3:
         *offset = 8192;
-        *codec = CODEC_ID_DTS;
+        *codec = AV_CODEC_ID_DTS;
         break;
     default:
         if (s) { /* be silent during a probe */
@@ -112,7 +112,7 @@ static int spdif_probe(AVProbeData *p)
     int sync_codes = 0;
     int consecutive_codes = 0;
     int offset;
-    enum CodecID codec;
+    enum AVCodecID codec;
 
     for (; buf < probe_end; buf++) {
         state = (state << 8) | *buf;
@@ -165,7 +165,7 @@ static int spdif_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     AVIOContext *pb = s->pb;
     enum IEC61937DataType data_type;
-    enum CodecID codec_id;
+    enum AVCodecID codec_id;
     uint32_t state = 0;
     int pkt_size_bits, offset, ret;