comparison mlpdec.c @ 8274:82dbfe8d2e0b libavcodec

mlp: Fix compilation under CONFIG_AUDIO_NONSHORT. Patch by Mathieu Velten < matmaul at gmail dot com >
author ramiro
date Sat, 06 Dec 2008 16:28:48 +0000
parents d73cd240d68c
children 9149588e5cc9
comparison
equal deleted inserted replaced
8273:55aba5d428f3 8274:82dbfe8d2e0b
295 295
296 m->avctx->sample_rate = mh.group1_samplerate; 296 m->avctx->sample_rate = mh.group1_samplerate;
297 m->avctx->frame_size = mh.access_unit_size; 297 m->avctx->frame_size = mh.access_unit_size;
298 298
299 #ifdef CONFIG_AUDIO_NONSHORT 299 #ifdef CONFIG_AUDIO_NONSHORT
300 m->avctx->bits_per_sample = mh.group1_bits; 300 m->avctx->bits_per_raw_sample = mh.group1_bits;
301 if (mh.group1_bits > 16) { 301 if (mh.group1_bits > 16) {
302 m->avctx->sample_fmt = SAMPLE_FMT_S32; 302 m->avctx->sample_fmt = SAMPLE_FMT_S32;
303 } 303 }
304 #endif 304 #endif
305 305