Mercurial > libavcodec.hg

comparison mlp_parser.c @ 8274:82dbfe8d2e0b libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 45cfe1d44e86
children 9149588e5cc9
comparison
equal deleted inserted replaced
8273:55aba5d428f3 8274:82dbfe8d2e0b
250 init_get_bits(&gb, buf + 4, (buf_size - 4) << 3); 250 init_get_bits(&gb, buf + 4, (buf_size - 4) << 3);
251 if (ff_mlp_read_major_sync(avctx, &mh, &gb) < 0) 251 if (ff_mlp_read_major_sync(avctx, &mh, &gb) < 0)
252 goto lost_sync; 252 goto lost_sync;
253 253
254 #ifdef CONFIG_AUDIO_NONSHORT 254 #ifdef CONFIG_AUDIO_NONSHORT
255 avctx->bits_per_sample = mh.group1_bits; 255 avctx->bits_per_raw_sample = mh.group1_bits;
256 if (avctx->bits_per_sample > 16) 256 if (avctx->bits_per_raw_sample > 16)
257 avctx->sample_fmt = SAMPLE_FMT_S32; 257 avctx->sample_fmt = SAMPLE_FMT_S32;
258 #endif 258 #endif
259 avctx->sample_rate = mh.group1_samplerate; 259 avctx->sample_rate = mh.group1_samplerate;
260 avctx->frame_size = mh.access_unit_size; 260 avctx->frame_size = mh.access_unit_size;
261 261