generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mlp: Fix compilation under CONFIG_AUDIO_NONSHORT.

Browse Source 
Patch by Mathieu Velten < matmaul at gmail dot com >

Originally committed as revision 16021 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Mathieu Velten 2008-12-06 16:28:48 +00:00 committed by Ramiro Polla
parent d98d70d697
commit 97679e6e38
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mlp_parser.c
View File

@ -252,8 +252,8 @@ static int mlp_parse(AVCodecParserContext *s,
goto lost_sync; goto lost_sync;
#ifdef CONFIG_AUDIO_NONSHORT #ifdef CONFIG_AUDIO_NONSHORT
avctx->bits_per_sample = mh.group1_bits; avctx->bits_per_raw_sample = mh.group1_bits;
if (avctx->bits_per_sample > 16) if (avctx->bits_per_raw_sample > 16)
avctx->sample_fmt = SAMPLE_FMT_S32; avctx->sample_fmt = SAMPLE_FMT_S32;
#endif #endif
avctx->sample_rate = mh.group1_samplerate; avctx->sample_rate = mh.group1_samplerate;

2
libavcodec/mlpdec.c
View File

@ -297,7 +297,7 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
m->avctx->frame_size = mh.access_unit_size; m->avctx->frame_size = mh.access_unit_size;
#ifdef CONFIG_AUDIO_NONSHORT #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) { if (mh.group1_bits > 16) {
m->avctx->sample_fmt = SAMPLE_FMT_S32; m->avctx->sample_fmt = SAMPLE_FMT_S32;
} }