Mercurial > libavcodec.hg

diff mlp_parser.c @ 8276:9149588e5cc9 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mlp: support bit-depths greater than 16 by default.
author ramiro
date Sun, 07 Dec 2008 00:57:26 +0000
parents 82dbfe8d2e0b
children e9d9d946f213
line wrap: on
line diff
--- a/mlp_parser.c	Sat Dec 06 16:33:16 2008 +0000
+++ b/mlp_parser.c	Sun Dec 07 00:57:26 2008 +0000
@@ -251,11 +251,11 @@
         if (ff_mlp_read_major_sync(avctx, &mh, &gb) < 0)
             goto lost_sync;
 
-#ifdef CONFIG_AUDIO_NONSHORT
         avctx->bits_per_raw_sample = mh.group1_bits;
         if (avctx->bits_per_raw_sample > 16)
             avctx->sample_fmt = SAMPLE_FMT_S32;
-#endif
+        else
+            avctx->sample_fmt = SAMPLE_FMT_S16;
         avctx->sample_rate = mh.group1_samplerate;
         avctx->frame_size = mh.access_unit_size;