mlp: Fix compilation under CONFIG_AUDIO_NONSHORT.

Patch by Mathieu Velten < matmaul at gmail dot com >

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@16021 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

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;

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;
     }