From bdd0280293a0e0d87a1a30f95c29e49da4ea7e8e Mon Sep 17 00:00:00 2001 From: Jean-Marc Valin Date: Thu, 14 Feb 2008 15:21:01 +1100 Subject: [PATCH] setting nb channels automatically from the mode. --- tools/celtdec.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/celtdec.c b/tools/celtdec.c index 0e04081d..cb0ccae3 100644 --- a/tools/celtdec.c +++ b/tools/celtdec.c @@ -296,11 +296,14 @@ static CELTDecoder *process_header(ogg_packet *op, celt_int32_t enh_enabled, cel celt_header_from_packet((char*)op->packet, op->bytes, &header); if (header.mode==0) - mode = celt_mono; - else if (header.mode==1) - mode = celt_stereo; - else { + mode = celt_mono; + *channels = 1; + } else if (header.mode==1) + { + mode = celt_stereo; + *channels = 2; + } else { fprintf (stderr, "Invalid mode: %d\n", header.mode); return NULL; } @@ -321,9 +324,6 @@ static CELTDecoder *process_header(ogg_packet *op, celt_int32_t enh_enabled, cel *nframes = 1; - if (*channels==-1) - *channels = header.nb_channels; - if (!quiet) { fprintf (stderr, "Decoding %d Hz audio in", *rate);