Mercurial > libavformat.hg
changeset 232:eb90c0a5a1ba libavformat
CODEC_ID_MP3LAME is obsolete
| author | bellard |
|---|---|
| date | Mon, 08 Sep 2003 22:04:29 +0000 |
| parents | 8ca8b6bc24a5 |
| children | 23a6daaa93dd |
| files | asf.c avienc.c flvdec.c flvenc.c nut.c raw.c rtp.c wav.c |
| diffstat | 8 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/asf.c Mon Sep 08 21:59:53 2003 +0000 +++ b/asf.c Mon Sep 08 22:04:29 2003 +0000 @@ -870,7 +870,7 @@ asf_st->ds_span = 0; // disable descrambling } switch (st->codec.codec_id) { - case CODEC_ID_MP3LAME: + case CODEC_ID_MP3: st->codec.frame_size = MPA_FRAME_SIZE; break; case CODEC_ID_PCM_S16LE: @@ -1252,7 +1252,7 @@ "asf,wmv", sizeof(ASFContext), #ifdef CONFIG_MP3LAME - CODEC_ID_MP3LAME, + CODEC_ID_MP3, #else CODEC_ID_MP2, #endif @@ -1269,7 +1269,7 @@ "asf,wmv", sizeof(ASFContext), #ifdef CONFIG_MP3LAME - CODEC_ID_MP3LAME, + CODEC_ID_MP3, #else CODEC_ID_MP2, #endif
--- a/avienc.c Mon Sep 08 21:59:53 2003 +0000 +++ b/avienc.c Mon Sep 08 22:04:29 2003 +0000 @@ -240,7 +240,7 @@ *au_ssize = 1; *au_scale = 1; *au_byterate = stream->bit_rate / 8; - case CODEC_ID_MP3LAME: + case CODEC_ID_MP3: *au_ssize = 1; *au_scale = 1; *au_byterate = stream->bit_rate / 8; @@ -570,7 +570,7 @@ if (nb_frames < stream->frame_number) nb_frames = stream->frame_number; } else { - if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3LAME) { + if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3) { put_le32(pb, stream->frame_number); nb_frames += stream->frame_number; } else { @@ -675,7 +675,7 @@ if (nb_frames < stream->frame_number) nb_frames = stream->frame_number; } else { - if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3LAME) { + if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3) { nb_frames += stream->frame_number; } }
--- a/flvdec.c Mon Sep 08 21:59:53 2003 +0000 +++ b/flvdec.c Mon Sep 08 22:04:29 2003 +0000 @@ -64,7 +64,7 @@ if (!st) return AVERROR_NOMEM; st->codec.codec_type = CODEC_TYPE_AUDIO; - st->codec.codec_id = CODEC_ID_MP3LAME; + st->codec.codec_id = CODEC_ID_MP3; } offset = get_be32(&s->pb);
--- a/flvenc.c Mon Sep 08 21:59:53 2003 +0000 +++ b/flvenc.c Mon Sep 08 22:04:29 2003 +0000 @@ -268,7 +268,7 @@ } else if (enc->codec_type == CODEC_TYPE_AUDIO) { #ifdef CONFIG_MP3LAME - if (enc->codec_id == CODEC_ID_MP3LAME ) { + if (enc->codec_id == CODEC_ID_MP3 ) { int c=0; for (;c<size;c++) { flv->audioFifo[(flv->audioOutPos+c)%AUDIO_FIFO_SIZE] = buf[c]; @@ -366,7 +366,7 @@ "flv", sizeof(FLVContext), #ifdef CONFIG_MP3LAME - CODEC_ID_MP3LAME, + CODEC_ID_MP3, #else // CONFIG_MP3LAME CODEC_ID_NONE, #endif // CONFIG_MP3LAME
--- a/nut.c Mon Sep 08 21:59:53 2003 +0000 +++ b/nut.c Mon Sep 08 22:04:29 2003 +0000 @@ -567,7 +567,7 @@ #ifdef CONFIG_VORBIS CODEC_ID_VORBIS, #elif defined(CONFIG_MP3LAME) - CODEC_ID_MP3LAME, + CODEC_ID_MP3, #else CODEC_ID_MP2, /* AC3 needs liba52 decoder */ #endif
--- a/raw.c Mon Sep 08 21:59:53 2003 +0000 +++ b/raw.c Mon Sep 08 22:04:29 2003 +0000 @@ -129,7 +129,7 @@ break; if( pos < s->pb.buffer_size-1 && (s->pb.buffer[pos+1] & 6) == 2 ) - st->codec.codec_id = CODEC_ID_MP3LAME; + st->codec.codec_id = CODEC_ID_MP3; /* the parameters will be extracted from the compressed bitstream */ return 0; @@ -259,7 +259,7 @@ "audio/x-mpeg", "mp3", 0, - CODEC_ID_MP3LAME, + CODEC_ID_MP3, 0, raw_write_header, raw_write_packet,
--- a/rtp.c Mon Sep 08 21:59:53 2003 +0000 +++ b/rtp.c Mon Sep 08 22:04:29 2003 +0000 @@ -170,7 +170,7 @@ } break; case CODEC_ID_MP2: - case CODEC_ID_MP3LAME: + case CODEC_ID_MP3: payload_type = RTP_PT_MPEGAUDIO; break; case CODEC_ID_MJPEG: @@ -390,7 +390,7 @@ switch(st->codec.codec_id) { case CODEC_ID_MP2: - case CODEC_ID_MP3LAME: + case CODEC_ID_MP3: s->buf_ptr = s->buf + 4; s->cur_timestamp = 0; break; @@ -650,7 +650,7 @@ rtp_send_samples(s1, buf1, size, 2 * st->codec.channels); break; case CODEC_ID_MP2: - case CODEC_ID_MP3LAME: + case CODEC_ID_MP3: rtp_send_mpegaudio(s1, buf1, size); break; case CODEC_ID_MPEG1VIDEO:
--- a/wav.c Mon Sep 08 21:59:53 2003 +0000 +++ b/wav.c Mon Sep 08 22:04:29 2003 +0000 @@ -21,7 +21,7 @@ const CodecTag codec_wav_tags[] = { { CODEC_ID_MP2, 0x50 }, - { CODEC_ID_MP3LAME, 0x55 }, + { CODEC_ID_MP3, 0x55 }, { CODEC_ID_AC3, 0x2000 }, { CODEC_ID_PCM_S16LE, 0x01 }, { CODEC_ID_PCM_U8, 0x01 }, /* must come after s16le in this list */ @@ -55,7 +55,7 @@ enc->codec_id == CODEC_ID_PCM_ALAW || enc->codec_id == CODEC_ID_PCM_MULAW) { bps = 8; - } else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3LAME) { + } else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) { bps = 0; } else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || enc->codec_id == CODEC_ID_ADPCM_MS) { bps = 4; @@ -63,7 +63,7 @@ bps = 16; } - if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3LAME) { + if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) { blkalign = 1; //blkalign = 144 * enc->bit_rate/enc->sample_rate; } else if (enc->block_align != 0) { /* specified by the codec */ @@ -79,7 +79,7 @@ put_le32(pb, bytespersec); /* bytes per second */ put_le16(pb, blkalign); /* block align */ put_le16(pb, bps); /* bits per sample */ - if (enc->codec_id == CODEC_ID_MP3LAME) { + if (enc->codec_id == CODEC_ID_MP3) { put_le16(pb, 12); /* wav_extra_size */ hdrsize += 12; put_le16(pb, 1); /* wID */