[FFmpeg-cvslog] r16021 - in trunk/libavcodec: mlp_parser.c mlpdec.c

[ramiro]

Author: ramiro
Date: Sat Dec  6 17:28:48 2008
New Revision: 16021

Log:
mlp: Fix compilation under CONFIG_AUDIO_NONSHORT.

Patch by Mathieu Velten < matmaul at gmail dot com >

Modified:
   trunk/libavcodec/mlp_parser.c
   trunk/libavcodec/mlpdec.c

Modified: trunk/libavcodec/mlp_parser.c
==============================================================================
--- trunk/libavcodec/mlp_parser.c	(original)
+++ trunk/libavcodec/mlp_parser.c	Sat Dec  6 17:28:48 2008
@@ -252,8 +252,8 @@ static int mlp_parse(AVCodecParserContex
             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;

Modified: trunk/libavcodec/mlpdec.c
==============================================================================
--- trunk/libavcodec/mlpdec.c	(original)
+++ trunk/libavcodec/mlpdec.c	Sat Dec  6 17:28:48 2008
@@ -297,7 +297,7 @@ static int read_major_sync(MLPDecodeCont
     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;
     }