Commit 97679e6e authored by Mathieu Velten's avatar Mathieu Velten Committed by Ramiro Polla
Browse files

mlp: Fix compilation under CONFIG_AUDIO_NONSHORT.

Patch by Mathieu Velten < matmaul at gmail dot com >

Originally committed as revision 16021 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent d98d70d6
......@@ -252,8 +252,8 @@ static int mlp_parse(AVCodecParserContext *s,
goto lost_sync;
#ifdef CONFIG_AUDIO_NONSHORT
avctx->bits_per_sample = mh.group1_bits;
if (avctx->bits_per_sample > 16)
avctx->bits_per_raw_sample = mh.group1_bits;
if (avctx->bits_per_raw_sample > 16)
avctx->sample_fmt = SAMPLE_FMT_S32;
#endif
avctx->sample_rate = mh.group1_samplerate;
......
......@@ -297,7 +297,7 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
m->avctx->frame_size = mh.access_unit_size;
#ifdef CONFIG_AUDIO_NONSHORT
m->avctx->bits_per_sample = mh.group1_bits;
m->avctx->bits_per_raw_sample = mh.group1_bits;
if (mh.group1_bits > 16) {
m->avctx->sample_fmt = SAMPLE_FMT_S32;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment