diff options
| author | Ramiro Polla <ramiro.polla@gmail.com> | 2008-12-07 00:57:26 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2008-12-07 00:57:26 +0000 |
| commit | ee1a8f62901b7043fb39c25d228e47521ee5c3d6 (patch) | |
| tree | 6a0bd30609a1ce8e1803a0d853e291408a8fa7fa /libavcodec/mlp_parser.c | |
| parent | dc50773dc5d2552ccd42df39fcf7afde41f8b648 (diff) | |
mlp: support bit-depths greater than 16 by default.
Originally committed as revision 16026 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mlp_parser.c')
| -rw-r--r-- | libavcodec/mlp_parser.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c index 792f84e28c..925ed86de2 100644 --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@ -251,11 +251,11 @@ static int mlp_parse(AVCodecParserContext *s, 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; |