Mercurial > libavcodec.hg
comparison libfaad.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 | 635ed2559262 |
comparison
equal
deleted
inserted
replaced
| 7822:67cfe4983e6d | 7823:4525dcd81357 |
|---|---|
| 277 | 277 |
| 278 | 278 |
| 279 faac_cfg = s->faacDecGetCurrentConfiguration(s->faac_handle); | 279 faac_cfg = s->faacDecGetCurrentConfiguration(s->faac_handle); |
| 280 | 280 |
| 281 if (faac_cfg) { | 281 if (faac_cfg) { |
| 282 switch (avctx->bits_per_sample) { | 282 switch (avctx->bits_per_coded_sample) { |
| 283 case 8: av_log(avctx, AV_LOG_ERROR, "FAADlib unsupported bps %d\n", avctx->bits_per_sample); break; | 283 case 8: av_log(avctx, AV_LOG_ERROR, "FAADlib unsupported bps %d\n", avctx->bits_per_coded_sample); break; |
| 284 default: | 284 default: |
| 285 case 16: | 285 case 16: |
| 286 #ifdef FAAD2_VERSION | 286 #ifdef FAAD2_VERSION |
| 287 faac_cfg->outputFormat = FAAD_FMT_16BIT; | 287 faac_cfg->outputFormat = FAAD_FMT_16BIT; |
| 288 #endif | 288 #endif |
