changeset 3448:837bc55b5913

updated for latest dshow api changes
author arpi
date Mon, 10 Dec 2001 21:58:37 +0000
parents 9e4e3d2286b2
children 8b7e5884cf34
files dec_video.c
diffstat 1 files changed, 1 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/dec_video.c	Mon Dec 10 21:57:53 2001 +0000
+++ b/dec_video.c	Mon Dec 10 21:58:37 2001 +0000
@@ -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");