summaryrefslogtreecommitdiff
path: root/libavdevice/oss_audio.c
diff options
context:
space:
mode:
Diffstat (limited to 'libavdevice/oss_audio.c')
-rw-r--r--libavdevice/oss_audio.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavdevice/oss_audio.c b/libavdevice/oss_audio.c
index f8843a37f9..7942bde264 100644
--- a/libavdevice/oss_audio.c
+++ b/libavdevice/oss_audio.c
@@ -49,7 +49,7 @@ typedef struct {
int sample_rate;
int channels;
int frame_size; /* in bytes ! */
- enum CodecID codec_id;
+ enum AVCodecID codec_id;
unsigned int flip_left : 1;
uint8_t buffer[AUDIO_BLOCK_SIZE];
int buffer_ptr;
@@ -104,10 +104,10 @@ static int audio_open(AVFormatContext *s1, int is_output, const char *audio_devi
switch(tmp) {
case AFMT_S16_LE:
- s->codec_id = CODEC_ID_PCM_S16LE;
+ s->codec_id = AV_CODEC_ID_PCM_S16LE;
break;
case AFMT_S16_BE:
- s->codec_id = CODEC_ID_PCM_S16BE;
+ s->codec_id = AV_CODEC_ID_PCM_S16BE;
break;
default:
av_log(s1, AV_LOG_ERROR, "Soundcard does not support 16 bit sample format\n");
@@ -314,8 +314,8 @@ AVOutputFormat ff_oss_muxer = {
/* XXX: we make the assumption that the soundcard accepts this format */
/* XXX: find better solution with "preinit" method, needed also in
other formats */
- .audio_codec = AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE),
- .video_codec = CODEC_ID_NONE,
+ .audio_codec = AV_NE(AV_CODEC_ID_PCM_S16BE, AV_CODEC_ID_PCM_S16LE),
+ .video_codec = AV_CODEC_ID_NONE,
.write_header = audio_write_header,
.write_packet = audio_write_packet,
.write_trailer = audio_write_trailer,