diff options
| author | Anton Khirnov <anton@khirnov.net> | 2012-08-05 11:11:04 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2012-08-07 16:00:24 +0200 |
| commit | 36ef5369ee9b336febc2c270f8718cec4476cb85 (patch) | |
| tree | d186adbb488e7f002aa894743b1ce0e8925520e6 /libavdevice/pulse.c | |
| parent | 104e10fb426f903ba9157fdbfe30292d0e4c3d72 (diff) | |
Replace all CODEC_ID_* with AV_CODEC_ID_*
Diffstat (limited to 'libavdevice/pulse.c')
| -rw-r--r-- | libavdevice/pulse.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libavdevice/pulse.c b/libavdevice/pulse.c index da6ee72e8e..3ddd6b6d03 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 }; |