diff --git a/src/MJPEGVideoSource.cpp b/src/MJPEGVideoSource.cpp
index fb62f1d..310eada 100644
--- a/src/MJPEGVideoSource.cpp
+++ b/src/MJPEGVideoSource.cpp
@@ -45,18 +45,20 @@ void MJPEGVideoSource::afterGettingFrame(unsigned frameSize,unsigned numTruncate
 		i+=length+2;
 	    }
 	    // DQT
-	    else if ( ( (i+5+64) < frameSize)  && (fTo[i] == 0xFF) && (fTo[i+1] == 0xDB)) {
+	    else if ((fTo[i] == 0xFF) && (fTo[i+1] == 0xDB)) {
 		int length = (fTo[i+2]<<8)|(fTo[i+3]);		    
 		LOG(DEBUG) << "DQT length:" << length;
 
 		unsigned int precision = (fTo[i+4]&0xf0)<<4;
 		unsigned int quantIdx  = fTo[i+4]&0x0f;
-		unsigned int quantSize = length-4;
+		unsigned int quantSize =  64*(precision+1);
 		if (quantSize*quantIdx+quantSize <= sizeof(m_qTable)) {
-		    memcpy(m_qTable + quantSize*quantIdx, fTo + i + 5, quantSize);
-		    LOG(DEBUG) << "Quantization table idx:" << quantIdx << " precision:" << precision << " size:" << quantSize << " total size:" << m_qTableSize;
-		    if (quantSize*quantIdx+quantSize > m_qTableSize) {
-			m_qTableSize = quantSize*quantIdx+quantSize;
+		    if ( (i+5+length) < frameSize) {
+		    	memcpy(m_qTable + quantSize*quantIdx, fTo + i + 5, length);
+		    	LOG(DEBUG) << "Quantization table idx:" << quantIdx << " precision:" << precision << " size:" << quantSize << " total size:" << m_qTableSize;
+		    	if (quantSize*quantIdx+quantSize > m_qTableSize) {
+				m_qTableSize = quantSize*quantIdx+quantSize;
+		    	}
 		    }
 		}