diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-10 21:58:37 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-10 21:58:37 +0000 |
| commit | f1dd0dd07050dcd1d55b42690e32c4ae1a2a978c (patch) | |
| tree | bc8ff6dda85efee96a72b277bee9b8d31a738af7 /dec_video.c | |
| parent | eec59c47ac3cb54c04d5a8418519c1a916ed89c7 (diff) | |
| download | mpv-f1dd0dd07050dcd1d55b42690e32c4ae1a2a978c.tar.bz2 mpv-f1dd0dd07050dcd1d55b42690e32c4ae1a2a978c.tar.xz | |
updated for latest dshow api changes
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3449 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'dec_video.c')
| -rw-r--r-- | dec_video.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/dec_video.c b/dec_video.c index 79bead8ea5..92ce3c99cf 100644 --- a/dec_video.c +++ b/dec_video.c @@ -59,13 +59,6 @@ int divx_quality=0; #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 @@ switch(sh_video->codec->driver){ 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"); |