diff --git a/darkice/branches/darkice-aacp/src/aacPlusEncoder.cpp b/darkice/branches/darkice-aacp/src/aacPlusEncoder.cpp
index 2ce24a7..7118865 100644
--- a/darkice/branches/darkice-aacp/src/aacPlusEncoder.cpp
+++ b/darkice/branches/darkice-aacp/src/aacPlusEncoder.cpp
@@ -145,8 +145,9 @@ aacPlusEncoder :: open ( void )
     aacplusOpen = true;
     reportEvent(10, "bitrate=", bitrate);
     reportEvent(10, "nChannelsIn", getInChannel());
+    reportEvent(10, "nChannelsOut", getOutChannel());
     reportEvent(10, "nChannelsSBR", nChannelsSBR);
-    reportEvent(10, "nChannelsOut", nChannelsAAC);
+    reportEvent(10, "nChannelsAAC", nChannelsAAC);
     reportEvent(10, "sampleRateAAC", sampleRateAAC);
     reportEvent(10, "inSamples", inSamples);
     return true;
@@ -181,8 +182,15 @@ aacPlusEncoder :: write (  const void    * buf,
     reportEvent(10, "converting short to float");
     short *TimeDataPcm = (short *) buf;
     
-    for (i=0; i<samples; i++)
-        inBuf[i+writeOffset+writtenSamples] = (float) TimeDataPcm[i];
+    if(channels == 2) {
+        for (i=0; i<samples; i++)
+            inBuf[i+writeOffset+writtenSamples] = (float) TimeDataPcm[i];
+    } else {
+        /* using only left channel buffer for mono encoder */
+        for (i=0; i<samples; i++)
+            inBuf[writeOffset+2*writtenSamples+2*i] = (float) TimeDataPcm[i];
+    }
+
     writtenSamples+=samples;
     reportEvent(10, "writtenSamples", writtenSamples);
     
@@ -206,7 +214,7 @@ aacPlusEncoder :: write (  const void    * buf,
         for( ch=0; ch<nChannelsAAC; ch++ )
             IIR21_Downsample( &(IIR21_reSampler[ch]),
                               inBuf + writeOffset+ch,
-                              writtenSamples/getInChannel(),
+                              writtenSamples/channels,
                               MAX_CHANNELS,
                               inBuf+ch,
                               &outSamples,
diff --git a/darkice/branches/darkice-aacp/src/aacPlusEncoder.h b/darkice/branches/darkice-aacp/src/aacPlusEncoder.h
index 397830b..dff56c9 100644
--- a/darkice/branches/darkice-aacp/src/aacPlusEncoder.h
+++ b/darkice/branches/darkice-aacp/src/aacPlusEncoder.h
@@ -146,12 +146,12 @@ class aacPlusEncoder : public AudioEncoder, public virtual Reporter
                                  getInBitsPerSample() );
             }
 
-            if ( getInChannel() != 2 ) {
+            if ( getInChannel() > 2 ) {
                 throw Exception( __FILE__, __LINE__,
                          "unsupported number of input channels for the encoder",
                                  getInChannel() );
             }
-            if ( getOutChannel() != 2 ) {
+            if ( getOutChannel() > 2 ) {
                 throw Exception( __FILE__, __LINE__,
                         "unsupported number of output channels for the encoder",
                                  getOutChannel() );