--- branches/dev-api-4/xvidcore/dshow/src/CXvidDecoder.h	2003/12/12 15:09:01	1260
+++ branches/dev-api-4/xvidcore/dshow/src/CXvidDecoder.h	2004/01/31 13:44:56	1345
@@ -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: CXvidDecoder.h,v 1.1.2.4 2003-12-12 15:09:01 Isibaar Exp $
+ * $Id: CXvidDecoder.h,v 1.1.2.8 2004-01-31 13:44:33 suxen_drol Exp $
  *
  ****************************************************************************/
 
@@ -29,33 +29,6 @@
 #include <xvid.h>
 #include "IXvidDecoder.h"
 
-#ifdef _DEBUG
-#include <stdio.h>	/* vsprintf */
-#define DPRINTF_BUF_SZ  1024
-static __inline void
-DPRINTF(char *fmt, ...)
-{
-	va_list args;
-	char buf[DPRINTF_BUF_SZ];
-
-	va_start(args, fmt);
-	vsprintf(buf, fmt, args);
-	OutputDebugString(buf);
-}
-#else
-static __inline void 
-DPRINTF(char *fmt, ...) { }
-#endif
-
-/* registry stuff */
-#define XVID_REG_KEY	HKEY_CURRENT_USER
-#define XVID_REG_SUBKEY	"Software\\GNU\\XviD"
-#define XVID_REG_CLASS	"config"
-
-#define REG_GET_N(X, Y, Z) size=sizeof(int);if(RegQueryValueEx(hKey, X, 0, 0, (LPBYTE)&Y, &size) != ERROR_SUCCESS) {Y=Z;}
-#define REG_GET_S(X, Y, Z) size=MAX_PATH;if(RegQueryValueEx(hKey, X, 0, 0, Y, &size) != ERROR_SUCCESS) {lstrcpy(Y, Z);}
-#define REG_SET_N(X, Y) RegSetValueEx(hKey, X, 0, REG_DWORD, (LPBYTE)&Y, sizeof(int))
-#define REG_SET_S(X, Y) RegSetValueEx(hKey, X, 0, REG_SZ, Y, lstrlen(Y)+1)
 
 #define XVID_NAME_L		L"XviD MPEG-4 Video Decoder"
 
@@ -64,6 +37,7 @@
 #define FOURCC_XVID	mmioFOURCC('X','V','I','D')
 #define FOURCC_DIVX	mmioFOURCC('D','I','V','X')
 #define FOURCC_DX50	mmioFOURCC('D','X','5','0')
+#define FOURCC_MP4V	mmioFOURCC('m','p','4','v')
 
 /* --- media uids --- */
 
@@ -73,6 +47,7 @@
 DEFINE_GUID(CLSID_DIVX_UC,	mmioFOURCC('D','I','V','X'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
 DEFINE_GUID(CLSID_DX50,		mmioFOURCC('d','x','5','0'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
 DEFINE_GUID(CLSID_DX50_UC,	mmioFOURCC('D','X','5','0'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(CLSID_MP4V,		mmioFOURCC('m','p','4','v'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
 
 
 /* MEDIATYPE_IYUV is not always defined in the directx headers */
@@ -109,6 +84,11 @@
 
 	xvid_dec_create_t m_create;
 	xvid_dec_frame_t m_frame;
+
+	HINSTANCE m_hdll;
+	int (*xvid_global_func)(void *handle, int opt, void *param1, void *param2);
+	int (*xvid_decore_func)(void *handle, int opt, void *param1, void *param2);
+	int ar_x, ar_y;
 };