--- branches/release-1_0-branch/xvidcore/vfw/src/codec.h	2004/03/22 23:56:55	1387
+++ branches/release-1_0-branch/xvidcore/vfw/src/codec.h	2004/03/31 19:35:31	1396
@@ -19,7 +19,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: codec.h,v 1.2 2004-03-22 22:36:25 edgomez Exp $
+ * $Id: codec.h,v 1.2.2.1 2004-03-31 19:35:31 edgomez Exp $
  *
  ****************************************************************************/
 #ifndef _CODEC_H_
@@ -66,6 +66,17 @@
 	int framenum;   
 	int keyspacing;
 
+	HINSTANCE m_hdll;
+	int (*xvid_global_func)(void *handle, int opt, void *param1, void *param2);
+	int (*xvid_encore_func)(void *handle, int opt, void *param1, void *param2);
+	int (*xvid_decore_func)(void *handle, int opt, void *param1, void *param2);
+
+	xvid_plugin_func *xvid_plugin_single_func;
+	xvid_plugin_func *xvid_plugin_2pass1_func;
+	xvid_plugin_func *xvid_plugin_2pass2_func;
+	xvid_plugin_func *xvid_plugin_lumimasking_func;
+	xvid_plugin_func *xvid_plugin_psnr_func;
+
 } CODEC;
 
 
@@ -84,17 +95,6 @@
 LRESULT decompress_end(CODEC *);
 LRESULT decompress(CODEC *, ICDECOMPRESS *);
 
-extern HINSTANCE m_hdll;
-extern int (*xvid_global_func)(void *handle, int opt, void *param1, void *param2);
-extern int (*xvid_encore_func)(void *handle, int opt, void *param1, void *param2);
-extern int (*xvid_decore_func)(void *handle, int opt, void *param1, void *param2);
-
-extern xvid_plugin_func *xvid_plugin_single_func, 
-				*xvid_plugin_2pass1_func,
-				*xvid_plugin_2pass2_func,
-				*xvid_plugin_lumimasking_func,
-				*xvid_plugin_psnr_func;
-
 extern int pp_dy, pp_duv, pp_dr, pp_fe; /* decoder options */
 
 #endif /* _CODEC_H_ */