Mercurial > libavcodec.hg

changeset 8274:82dbfe8d2e0b libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mlp: Fix compilation under CONFIG_AUDIO_NONSHORT. Patch by Mathieu Velten < matmaul at gmail dot com >
author ramiro
date Sat, 06 Dec 2008 16:28:48 +0000
parents 55aba5d428f3
children e2ef97f0ab4b
files mlp_parser.c mlpdec.c
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- 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;
     }