# HG changeset patch
# User ramiro
# Date 1228580928 0
# Node ID 82dbfe8d2e0b68ad374e185913e80e515bc4c027
# Parent  55aba5d428f362eb1067c48416f5bbc03cbf949f
mlp: Fix compilation under CONFIG_AUDIO_NONSHORT.

Patch by Mathieu Velten < matmaul at gmail dot com >

diff -r 55aba5d428f3 -r 82dbfe8d2e0b mlp_parser.c
--- a/mlp_parser.c	Sat Dec 06 16:19:44 2008 +0000
+++ b/mlp_parser.c	Sat Dec 06 16:28:48 2008 +0000
@@ -252,8 +252,8 @@
             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 -r 55aba5d428f3 -r 82dbfe8d2e0b mlpdec.c
--- a/mlpdec.c	Sat Dec 06 16:19:44 2008 +0000
+++ b/mlpdec.c	Sat Dec 06 16:28:48 2008 +0000
@@ -297,7 +297,7 @@
     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;
     }