Mercurial > libavcodec.hg
comparison vmdav.c @ 7823:4525dcd81357 libavcodec
Bump Major version, this commit is almost just renaming bits_per_sample to
bits_per_coded_sample but that cannot be done seperately.
Patch by Luca Abeni
Also reset the minor version and fix the forgotton change to libfaad.
Note: The API/ABI should not be considered stable yet, there still may
be a change done here or there if some developer has some cleanup ideas and
patches!
author | michael |
---|---|
date | Mon, 08 Sep 2008 14:24:59 +0000 |
parents | 85ab7655ad4d |
children | 2acf0ae7b041 |
comparison
equal
deleted
inserted
replaced
7822:67cfe4983e6d | 7823:4525dcd81357 |
---|---|
442 { | 442 { |
443 VmdAudioContext *s = avctx->priv_data; | 443 VmdAudioContext *s = avctx->priv_data; |
444 | 444 |
445 s->avctx = avctx; | 445 s->avctx = avctx; |
446 s->channels = avctx->channels; | 446 s->channels = avctx->channels; |
447 s->bits = avctx->bits_per_sample; | 447 s->bits = avctx->bits_per_coded_sample; |
448 s->block_align = avctx->block_align; | 448 s->block_align = avctx->block_align; |
449 avctx->sample_fmt = SAMPLE_FMT_S16; | 449 avctx->sample_fmt = SAMPLE_FMT_S16; |
450 | 450 |
451 av_log(s->avctx, AV_LOG_DEBUG, "%d channels, %d bits/sample, block align = %d, sample rate = %d\n", | 451 av_log(s->avctx, AV_LOG_DEBUG, "%d channels, %d bits/sample, block align = %d, sample rate = %d\n", |
452 s->channels, s->bits, s->block_align, avctx->sample_rate); | 452 s->channels, s->bits, s->block_align, avctx->sample_rate); |