- Changes on AVI and WAV muxers to support MP3.
Originally committed as revision 324 to svn://svn.ffmpeg.org/ffmpeg/trunk
*au_ssize = 1;
*au_scale = 1;
*au_byterate = stream->bit_rate / 8;
*au_ssize = 1;
*au_scale = 1;
*au_byterate = stream->bit_rate / 8;
+ case CODEC_ID_MP3LAME:
+ *au_ssize = 1;
+ *au_scale = 1;
+ *au_byterate = stream->bit_rate / 8;
default:
*au_ssize = 1;
*au_scale = 1;
default:
*au_ssize = 1;
*au_scale = 1;
if (nb_frames < stream->frame_number)
nb_frames = stream->frame_number;
} else {
if (nb_frames < stream->frame_number)
nb_frames = stream->frame_number;
} else {
- if (stream->codec_id == CODEC_ID_MP2) {
+ if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3LAME) {
put_le32(pb, stream->frame_number);
nb_frames += stream->frame_number;
} else {
put_le32(pb, stream->frame_number);
nb_frames += stream->frame_number;
} else {
CodecTag codec_wav_tags[] = {
{ CODEC_ID_MP2, 0x55 },
CodecTag codec_wav_tags[] = {
{ CODEC_ID_MP2, 0x55 },
+ { CODEC_ID_MP3LAME, 0x55 },
{ CODEC_ID_MP2, 0x50 },
{ CODEC_ID_AC3, 0x2000 },
{ CODEC_ID_PCM_S16LE, 0x01 },
{ CODEC_ID_MP2, 0x50 },
{ CODEC_ID_AC3, 0x2000 },
{ CODEC_ID_PCM_S16LE, 0x01 },
enc->codec_id == CODEC_ID_PCM_ALAW ||
enc->codec_id == CODEC_ID_PCM_MULAW) {
bps = 8;
enc->codec_id == CODEC_ID_PCM_ALAW ||
enc->codec_id == CODEC_ID_PCM_MULAW) {
bps = 8;
- } else if (enc->codec_id == CODEC_ID_MP2) {
+ } else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3LAME) {
bps = 0;
} else {
bps = 16;
}
bps = 0;
} else {
bps = 16;
}
- if (enc->codec_id == CODEC_ID_MP2)
+ if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3LAME)
blkalign = 1;
else
blkalign = enc->channels*bps >> 3;
blkalign = 1;
else
blkalign = enc->channels*bps >> 3;
put_le32(pb, bytespersec); /* bytes per second */
put_le16(pb, blkalign); /* block align */
put_le16(pb, bps); /* bits per sample */
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_MP2) {
+ if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3LAME) {
put_le16(pb, 12); /* wav_extra_size */
put_le16(pb, 1); /* wID */
put_le32(pb, 2); /* fdwFlags */
put_le16(pb, 12); /* wav_extra_size */
put_le16(pb, 1); /* wID */
put_le32(pb, 2); /* fdwFlags */
libac3/imdct.o libac3/parse.o
endif
libac3/imdct.o libac3/parse.o
endif
+ifeq ($(CONFIG_MP3LAME),yes)
+OBJS += mp3lameaudio.o
+endif
+
ifeq ($(TARGET_GPROF),yes)
CFLAGS+=-p
LDFLAGS+=-p
ifeq ($(TARGET_GPROF),yes)
CFLAGS+=-p
LDFLAGS+=-p