diff options
| author | Mathieu Velten <matmaul@gmail.com> | 2008-12-06 16:28:48 +0000 |
|---|---|---|
| committer | Ramiro Polla <ramiro.polla@gmail.com> | 2008-12-06 16:28:48 +0000 |
| commit | 97679e6e381971798da1dfcdd66b331240983d3d (patch) | |
| tree | 2a373a6ce8d6822203f7b8396ef5036e0e82da94 | |
| parent | d98d70d697a9462d834ac52265abd8255c0b326c (diff) | |
| download | ffmpeg-97679e6e381971798da1dfcdd66b331240983d3d.tar.gz | |
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
| -rw-r--r-- | libavcodec/mlp_parser.c | 4 | ||||
| -rw-r--r-- | libavcodec/mlpdec.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c index 191433376a..792f84e28c 100644 --- a/libavcodec/mlp_parser.c +++ b/libavcodec/mlp_parser.c @@ -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; diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index 7272458085..72f213cd13 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -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; } |