Revision 5798368b

View differences:

libav/avienc.c
127 127
        *au_ssize = 1;
128 128
        *au_scale = 1;
129 129
        *au_byterate = stream->bit_rate / 8;
130
    case CODEC_ID_MP3LAME:
131
        *au_ssize = 1;
132
        *au_scale = 1;
133
        *au_byterate = stream->bit_rate / 8;    
130 134
    default:
131 135
        *au_ssize = 1;
132 136
        *au_scale = 1; 
......
361 365
                    if (nb_frames < stream->frame_number)
362 366
                        nb_frames = stream->frame_number;
363 367
                } else {
364
                    if (stream->codec_id == CODEC_ID_MP2) {
368
                    if (stream->codec_id == CODEC_ID_MP2 || stream->codec_id == CODEC_ID_MP3LAME) {
365 369
                        put_le32(pb, stream->frame_number);
366 370
                        nb_frames += stream->frame_number;
367 371
                    } else {
libav/wav.c
21 21

  
22 22
CodecTag codec_wav_tags[] = {
23 23
    { CODEC_ID_MP2, 0x55 },
24
    { CODEC_ID_MP3LAME, 0x55 },
24 25
    { CODEC_ID_MP2, 0x50 },
25 26
    { CODEC_ID_AC3, 0x2000 },
26 27
    { CODEC_ID_PCM_S16LE, 0x01 },
......
45 46
        enc->codec_id == CODEC_ID_PCM_ALAW ||
46 47
        enc->codec_id == CODEC_ID_PCM_MULAW) {
47 48
        bps = 8;
48
    } else if (enc->codec_id == CODEC_ID_MP2) {
49
    } else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3LAME) {
49 50
        bps = 0;
50 51
    } else {
51 52
        bps = 16;
52 53
    }
53 54
    
54
    if (enc->codec_id == CODEC_ID_MP2)
55
    if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3LAME)
55 56
        blkalign = 1;
56 57
    else
57 58
        blkalign = enc->channels*bps >> 3;
......
64 65
    put_le32(pb, bytespersec); /* bytes per second */
65 66
    put_le16(pb, blkalign); /* block align */
66 67
    put_le16(pb, bps); /* bits per sample */
67
    if (enc->codec_id == CODEC_ID_MP2) {
68
    if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3LAME) {
68 69
        put_le16(pb, 12); /* wav_extra_size */
69 70
        put_le16(pb, 1); /* wID */
70 71
        put_le32(pb, 2); /* fdwFlags */
libavcodec/Makefile
16 16
       libac3/imdct.o  libac3/parse.o
17 17
endif
18 18

  
19
ifeq ($(CONFIG_MP3LAME),yes)
20
OBJS += mp3lameaudio.o
21
endif
22

  
19 23
ifeq ($(TARGET_GPROF),yes)
20 24
CFLAGS+=-p
21 25
LDFLAGS+=-p

Also available in: Unified diff