[FFmpeg-cvslog] r16026 - in trunk/libavcodec: mlp_parser.c mlpdec.c
ramiro
subversion
Sun Dec 7 01:57:27 CET 2008
Author: ramiro
Date: Sun Dec 7 01:57:26 2008
New Revision: 16026
Log:
mlp: support bit-depths greater than 16 by default.
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 Sun Dec 7 01:57:26 2008
@@ -251,11 +251,11 @@ static int mlp_parse(AVCodecParserContex
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;
Modified: trunk/libavcodec/mlpdec.c
==============================================================================
--- trunk/libavcodec/mlpdec.c (original)
+++ trunk/libavcodec/mlpdec.c Sun Dec 7 01:57:26 2008
@@ -222,7 +222,7 @@ static av_cold int mlp_decode_init(AVCod
m->avctx = avctx;
for (substr = 0; substr < MAX_SUBSTREAMS; substr++)
m->substream[substr].lossless_check_data = 0xffffffff;
- avctx->sample_fmt = SAMPLE_FMT_S16;
+
return 0;
}
@@ -296,12 +296,12 @@ static int read_major_sync(MLPDecodeCont
m->avctx->sample_rate = mh.group1_samplerate;
m->avctx->frame_size = mh.access_unit_size;
-#ifdef CONFIG_AUDIO_NONSHORT
m->avctx->bits_per_raw_sample = mh.group1_bits;
if (mh.group1_bits > 16) {
m->avctx->sample_fmt = SAMPLE_FMT_S32;
}
-#endif
+ else
+ m->avctx->sample_fmt = SAMPLE_FMT_S16;
m->params_valid = 1;
for (substr = 0; substr < MAX_SUBSTREAMS; substr++)
More information about the ffmpeg-cvslog
mailing list