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/libavdevice/pulse.c b/libavdevice/pulse.c
index 044ec31..8179712 100644
--- a/libavdevice/pulse.c
+++ b/libavdevice/pulse.c
@@ -33,7 +33,7 @@
 #include "libavformat/internal.h"
 #include "libavutil/opt.h"
 
-#define DEFAULT_CODEC_ID AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE)
+#define DEFAULT_CODEC_ID AV_NE(AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE)
 
 typedef struct PulseData {
     AVClass *class;
@@ -51,17 +51,17 @@ typedef struct PulseData {
 
 static pa_sample_format_t codec_id_to_pulse_format(int codec_id) {
     switch (codec_id) {
-    case CODEC_ID_PCM_U8:    return PA_SAMPLE_U8;
-    case CODEC_ID_PCM_ALAW:  return PA_SAMPLE_ALAW;
-    case CODEC_ID_PCM_MULAW: return PA_SAMPLE_ULAW;
-    case CODEC_ID_PCM_S16LE: return PA_SAMPLE_S16LE;
-    case CODEC_ID_PCM_S16BE: return PA_SAMPLE_S16BE;
-    case CODEC_ID_PCM_F32LE: return PA_SAMPLE_FLOAT32LE;
-    case CODEC_ID_PCM_F32BE: return PA_SAMPLE_FLOAT32BE;
-    case CODEC_ID_PCM_S32LE: return PA_SAMPLE_S32LE;
-    case CODEC_ID_PCM_S32BE: return PA_SAMPLE_S32BE;
-    case CODEC_ID_PCM_S24LE: return PA_SAMPLE_S24LE;
-    case CODEC_ID_PCM_S24BE: return PA_SAMPLE_S24BE;
+    case AV_CODEC_ID_PCM_U8:    return PA_SAMPLE_U8;
+    case AV_CODEC_ID_PCM_ALAW:  return PA_SAMPLE_ALAW;
+    case AV_CODEC_ID_PCM_MULAW: return PA_SAMPLE_ULAW;
+    case AV_CODEC_ID_PCM_S16LE: return PA_SAMPLE_S16LE;
+    case AV_CODEC_ID_PCM_S16BE: return PA_SAMPLE_S16BE;
+    case AV_CODEC_ID_PCM_F32LE: return PA_SAMPLE_FLOAT32LE;
+    case AV_CODEC_ID_PCM_F32BE: return PA_SAMPLE_FLOAT32BE;
+    case AV_CODEC_ID_PCM_S32LE: return PA_SAMPLE_S32LE;
+    case AV_CODEC_ID_PCM_S32BE: return PA_SAMPLE_S32BE;
+    case AV_CODEC_ID_PCM_S24LE: return PA_SAMPLE_S24LE;
+    case AV_CODEC_ID_PCM_S24BE: return PA_SAMPLE_S24BE;
     default:                 return PA_SAMPLE_INVALID;
     }
 }
@@ -72,8 +72,8 @@ static av_cold int pulse_read_header(AVFormatContext *s)
     AVStream *st;
     char *device = NULL;
     int ret;
-    enum CodecID codec_id =
-        s->audio_codec_id == CODEC_ID_NONE ? DEFAULT_CODEC_ID : s->audio_codec_id;
+    enum AVCodecID codec_id =
+        s->audio_codec_id == AV_CODEC_ID_NONE ? DEFAULT_CODEC_ID : s->audio_codec_id;
     const pa_sample_spec ss = { codec_id_to_pulse_format(codec_id),
                                 pd->sample_rate,
                                 pd->channels };