diff --git a/client/decoder/flacDecoder.cpp b/client/decoder/flacDecoder.cpp
index 0aa191cc..1e0dc68e 100644
--- a/client/decoder/flacDecoder.cpp
+++ b/client/decoder/flacDecoder.cpp
@@ -133,30 +133,9 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder
 {
 	(void)decoder;
 
-/*	if(channels != 2 || bps != 16) {
-		fprintf(stderr, "ERROR: this example only supports 16bit stereo streams\n");
-		return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
-	}
-	if(frame->header.channels != 2) {
-		fprintf(stderr, "ERROR: This frame contains %d channels (should be 2)\n", frame->header.channels);
-		return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
-	}
-*/	if (buffer[0] == NULL)
-	{
-		logS(kLogErr) << "ERROR: buffer [0] is NULL\n";
-		return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
-	}
-
-	if (buffer[1] == NULL)
-	{
-		logS(kLogErr) << "ERROR: buffer [1] is NULL\n";
-		return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
-	}
-
 	if (pcmChunk != NULL)
 	{
-//TODO: hard coded to 2 channels, 16 bit
-		size_t bytes = frame->header.blocksize * 4;
+		size_t bytes = frame->header.blocksize * sampleFormat.frameSize;
 
 		FlacDecoder* flacDecoder = static_cast<FlacDecoder*>(client_data);
 		if (flacDecoder->cacheInfo_.isCachedChunk_)
@@ -164,13 +143,32 @@ FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder
 
 		pcmChunk->payload = (char*)realloc(pcmChunk->payload, pcmChunk->payloadSize + bytes);
 
-		int16_t* pcm = (int16_t*)(pcmChunk->payload + pcmChunk->payloadSize);
-		for(size_t i = 0; i < frame->header.blocksize; i++)
+		for (size_t channel = 0; channel < sampleFormat.channels; ++channel)
 		{
-			pcm[2*i] = SWAP_16((int16_t)(buffer[0][i]));
-			pcm[2*i + 1] = SWAP_16((int16_t)(buffer[1][i]));
-//			memcpy(pcmChunk->payload + pcmChunk->payloadSize + 4*i, (char*)(buffer[0] + i), 2);
-//			memcpy(pcmChunk->payload + pcmChunk->payloadSize + 4*i+2, (char*)(buffer[1] + i), 2);
+			if (buffer[channel] == NULL)
+			{
+				logS(kLogErr) << "ERROR: buffer[" << channel << "] is NULL\n";
+				return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+			}
+			
+			if (sampleFormat.sampleSize == 1)
+			{
+				int8_t* pcm = (int8_t*)(pcmChunk->payload + pcmChunk->payloadSize);
+				for(size_t i = 0; i < frame->header.blocksize; i++)
+					pcm[sampleFormat.channels*i + channel] = (int8_t)(buffer[channel][i]);
+			}
+			else if (sampleFormat.sampleSize == 2)
+			{
+				int16_t* pcm = (int16_t*)(pcmChunk->payload + pcmChunk->payloadSize);
+				for(size_t i = 0; i < frame->header.blocksize; i++)
+					pcm[sampleFormat.channels*i + channel] = SWAP_16((int16_t)(buffer[channel][i]));
+			}
+			else if (sampleFormat.sampleSize == 4)
+			{
+				int32_t* pcm = (int32_t*)(pcmChunk->payload + pcmChunk->payloadSize);
+				for(size_t i = 0; i < frame->header.blocksize; i++)
+					pcm[sampleFormat.channels*i + channel] = SWAP_32((int32_t)(buffer[channel][i]));
+			}
 		}
 		pcmChunk->payloadSize += bytes;
 	}
diff --git a/server/encoder/flacEncoder.cpp b/server/encoder/flacEncoder.cpp
index 7e5715b7..9c8a1d0b 100644
--- a/server/encoder/flacEncoder.cpp
+++ b/server/encoder/flacEncoder.cpp
@@ -80,10 +80,25 @@ void FlacEncoder::encode(const msg::PcmChunk* chunk)
 		pcmBuffer_ = (FLAC__int32*)realloc(pcmBuffer_, pcmBufferSize_ * sizeof(FLAC__int32));
 	}
 
-	for(int i=0; i<samples; i++)
+	if (sampleFormat_.sampleSize == 1)
 	{
-		pcmBuffer_[i] = (FLAC__int32)(((FLAC__int16)(FLAC__int8)chunk->payload[2*i+1] << 8) | (FLAC__int16)(0x00ff&chunk->payload[2*i]));
+		FLAC__int8* buffer = (FLAC__int8*)chunk->payload; 
+		for(int i=0; i<samples; i++)
+			pcmBuffer_[i] = (FLAC__int32)(buffer[i]);
 	}
+	else if (sampleFormat_.sampleSize == 2)
+	{
+		FLAC__int16* buffer = (FLAC__int16*)chunk->payload; 
+		for(int i=0; i<samples; i++)
+			pcmBuffer_[i] = (FLAC__int32)(buffer[i]);
+	}
+	else if (sampleFormat_.sampleSize == 4)
+	{
+		FLAC__int32* buffer = (FLAC__int32*)chunk->payload; 
+		for(int i=0; i<samples; i++)
+			pcmBuffer_[i] = (FLAC__int32)(buffer[i]);
+	}
+
 
 	FLAC__stream_encoder_process_interleaved(encoder_, pcmBuffer_, frames);