--- encoder.h	2006/01/19 22:25:18	1.30
+++ encoder.h	2006/07/10 08:09:59	1.32
@@ -20,7 +20,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: encoder.h,v 1.30 2006/01/19 22:25:18 Isibaar Exp $
+ * $Id: encoder.h,v 1.32 2006/07/10 08:09:59 syskin Exp $
  *
  ****************************************************************************/
 
@@ -79,11 +79,6 @@
 	int par_width;
 	int par_height;
 
-#ifdef _SMP
-	int num_threads;
-#endif
-
-
 	int iMaxKeyInterval;
 	int max_bframes;
 
@@ -101,6 +96,7 @@
 	int64_t m_stamp;
 
 	uint16_t *mpeg_quant_matrices;
+	uint32_t last_quant_initialized_intra; /* needed for mpeg matrices initialization */
 } MBParam;
 
 
@@ -160,6 +156,8 @@
 } FRAMEINFO;
 
 
+#include "motion/motion_smp.h"
+
 typedef struct
 {
 	MBParam mbParam;
@@ -218,6 +216,10 @@
 	int closed_bframenum; /* == -1 if there is no fixup intended */
     QUEUEINFO closed_qframe;	/* qFrame, only valid when >= 0 */
 
+	/* multithreaded stuff */
+	int num_threads;			/* number of additional threads */
+	SMPmotionData * motionData;	/* data structures used to pass all thread-specific data */
+
 	int m_framenum; /* debug frame num counter; unlike iFrameNum, does not reset at ivop */
 
 	float fMvPrevSigma;