Mercurial > libavcodec.hg
changeset 8276:9149588e5cc9 libavcodec
mlp: support bit-depths greater than 16 by default.
| author | ramiro |
|---|---|
| date | Sun, 07 Dec 2008 00:57:26 +0000 |
| parents | e2ef97f0ab4b |
| children | a793f9afd5cb |
| files | mlp_parser.c mlpdec.c |
| diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/mlp_parser.c Sat Dec 06 16:33:16 2008 +0000 +++ b/mlp_parser.c Sun Dec 07 00:57:26 2008 +0000 @@ -251,11 +251,11 @@ if (ff_mlp_read_major_sync(avctx, &mh, &gb) < 0) goto lost_sync; -#ifdef CONFIG_AUDIO_NONSHORT avctx->bits_per_raw_sample = mh.group1_bits; if (avctx->bits_per_raw_sample > 16) avctx->sample_fmt = SAMPLE_FMT_S32; -#endif + else + avctx->sample_fmt = SAMPLE_FMT_S16; avctx->sample_rate = mh.group1_samplerate; avctx->frame_size = mh.access_unit_size;
--- a/mlpdec.c Sat Dec 06 16:33:16 2008 +0000 +++ b/mlpdec.c Sun Dec 07 00:57:26 2008 +0000 @@ -222,7 +222,7 @@ m->avctx = avctx; for (substr = 0; substr < MAX_SUBSTREAMS; substr++) m->substream[substr].lossless_check_data = 0xffffffff; - avctx->sample_fmt = SAMPLE_FMT_S16; + return 0; } @@ -296,12 +296,12 @@ m->avctx->sample_rate = mh.group1_samplerate; m->avctx->frame_size = mh.access_unit_size; -#ifdef CONFIG_AUDIO_NONSHORT m->avctx->bits_per_raw_sample = mh.group1_bits; if (mh.group1_bits > 16) { m->avctx->sample_fmt = SAMPLE_FMT_S32; } -#endif + else + m->avctx->sample_fmt = SAMPLE_FMT_S16; m->params_valid = 1; for (substr = 0; substr < MAX_SUBSTREAMS; substr++)