← Back to branch summary

~medibuntu-maintainers/mplayer/medibuntu.precise

« back to all changes in this revision

Viewing changes to ffmpeg/libavcodec/wmaenc.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:23:28 UTC
  • mfrom: (0.4.7 sid)
  • mto: This revision was merged to the branch mainline in revision 76.
  • Revision ID: package-import@ubuntu.com-20120112222328-8jqdyodym3p84ygu
Tags: 2:1.0~rc4.dfsg1+svn34540-1
* New upstream snapshot
* upload to unstable

Show diffs side-by-side

added added

removed removed

Lines of Context:
ffmpeg/libavcodec/wmaenc.c
311
311
                put_bits(&s->pb, s->coef_vlcs[tindex]->huffbits[1], s->coef_vlcs[tindex]->huffcodes[1]);
312
312
        }
313
313
        if (s->version == 1 && s->nb_channels >= 2) {
314
 
            align_put_bits(&s->pb);
 
314
            avpriv_align_put_bits(&s->pb);
315
315
        }
316
316
    }
317
317
    return 0;
327
327
            return INT_MAX;
328
328
    }
329
329
 
330
 
    align_put_bits(&s->pb);
 
330
    avpriv_align_put_bits(&s->pb);
331
331
 
332
332
    return put_bits_count(&s->pb)/8 - s->block_align;
333
333
}
390
390
    return put_bits_ptr(&s->pb) - s->pb.buf;
391
391
}
392
392
 
393
 
AVCodec ff_wmav1_encoder =
394
 
{
395
 
    "wmav1",
396
 
    AVMEDIA_TYPE_AUDIO,
397
 
    CODEC_ID_WMAV1,
398
 
    sizeof(WMACodecContext),
399
 
    encode_init,
400
 
    encode_superframe,
401
 
    ff_wma_end,
402
 
    .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
403
 
    .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"),
 
393
AVCodec ff_wmav1_encoder = {
 
394
    .name           = "wmav1",
 
395
    .type           = AVMEDIA_TYPE_AUDIO,
 
396
    .id             = CODEC_ID_WMAV1,
 
397
    .priv_data_size = sizeof(WMACodecContext),
 
398
    .init           = encode_init,
 
399
    .encode         = encode_superframe,
 
400
    .close          = ff_wma_end,
 
401
    .sample_fmts    = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
 
402
    .long_name      = NULL_IF_CONFIG_SMALL("Windows Media Audio 1"),
404
403
};
405
404
 
406
 
AVCodec ff_wmav2_encoder =
407
 
{
408
 
    "wmav2",
409
 
    AVMEDIA_TYPE_AUDIO,
410
 
    CODEC_ID_WMAV2,
411
 
    sizeof(WMACodecContext),
412
 
    encode_init,
413
 
    encode_superframe,
414
 
    ff_wma_end,
415
 
    .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
416
 
    .long_name = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"),
 
405
AVCodec ff_wmav2_encoder = {
 
406
    .name           = "wmav2",
 
407
    .type           = AVMEDIA_TYPE_AUDIO,
 
408
    .id             = CODEC_ID_WMAV2,
 
409
    .priv_data_size = sizeof(WMACodecContext),
 
410
    .init           = encode_init,
 
411
    .encode         = encode_superframe,
 
412
    .close          = ff_wma_end,
 
413
    .sample_fmts    = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
 
414
    .long_name      = NULL_IF_CONFIG_SMALL("Windows Media Audio 2"),
417
415
};