[Mplayer-cvslog] CVS: main dec_video.c,1.73,1.74

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv12288

Modified Files:
	dec_video.c 
Log Message:
updated for latest dshow api changes

Index: dec_video.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_video.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- dec_video.c	10 Dec 2001 20:11:31 -0000	1.73
+++ dec_video.c	10 Dec 2001 21:58:37 -0000	1.74
@@ -59,13 +59,6 @@
 #ifdef USE_DIRECTSHOW
 static void* ds_vdec=NULL;
 #ifdef NEW_DSHOW
-//#include "loader/dshow/DS_VideoDecoder.h"
-//static DS_VideoDecoder* ds_vdec=NULL;
-typedef struct _CodecInfo
-{
-    char* dll;
-    GUID* guid;
-}CodecInfo;
 #else
 #include "loader/DirectShow/DS_VideoDec.h"
 #endif
@@ -355,14 +348,7 @@
    return 0;
 #else
    int bpp;
-#ifdef NEW_DSHOW
-   CodecInfo ci;
-   ci.dll=sh_video->codec->dll;
-   ci.guid=&sh_video->codec->guid;
-   if(!(ds_vdec=DS_VideoDecoder_Create(&ci,sh_video->bih, 0, 0))){
-#else
-   if(!(ds_vdec=DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, sh_video->bih, 0))){
-#endif
+   if(!(ds_vdec=DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, sh_video->bih, 0, 0))){
 //   if(DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, sh_video->bih, 0, NULL)){
         mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingDLLcodec,sh_video->codec->dll);
         mp_msg(MSGT_DECVIDEO,MSGL_HINT,"Maybe you forget to upgrade your win32 codecs?? It's time to download the new\n");