Mercurial > mplayer.hg

comparison dec_video.c @ 3448:837bc55b5913

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for latest dshow api changes
author arpi
date Mon, 10 Dec 2001 21:58:37 +0000
parents 62b452b7ddf9
children 8b7e5884cf34
comparison
equal deleted inserted replaced
3447:9e4e3d2286b2 3448:837bc55b5913
57 int divx_quality=0; 57 int divx_quality=0;
58 58
59 #ifdef USE_DIRECTSHOW 59 #ifdef USE_DIRECTSHOW
60 static void* ds_vdec=NULL; 60 static void* ds_vdec=NULL;
61 #ifdef NEW_DSHOW 61 #ifdef NEW_DSHOW
62 //#include "loader/dshow/DS_VideoDecoder.h"
63 //static DS_VideoDecoder* ds_vdec=NULL;
64 typedef struct _CodecInfo
65 {
66 char* dll;
67 GUID* guid;
68 }CodecInfo;
69 #else 62 #else
70 #include "loader/DirectShow/DS_VideoDec.h" 63 #include "loader/DirectShow/DS_VideoDec.h"
71 #endif 64 #endif
72 #endif 65 #endif
73 66
353 #ifndef USE_DIRECTSHOW 346 #ifndef USE_DIRECTSHOW
354 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_NoDShowSupport); 347 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_NoDShowSupport);
355 return 0; 348 return 0;
356 #else 349 #else
357 int bpp; 350 int bpp;
358 #ifdef NEW_DSHOW 351 if(!(ds_vdec=DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, sh_video->bih, 0, 0))){
359 CodecInfo ci;
360 ci.dll=sh_video->codec->dll;
361 ci.guid=&sh_video->codec->guid;
362 if(!(ds_vdec=DS_VideoDecoder_Create(&ci,sh_video->bih, 0, 0))){
363 #else
364 if(!(ds_vdec=DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, sh_video->bih, 0))){
365 #endif
366 // if(DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, sh_video->bih, 0, NULL)){ 352 // if(DS_VideoDecoder_Open(sh_video->codec->dll,&sh_video->codec->guid, sh_video->bih, 0, NULL)){
367 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingDLLcodec,sh_video->codec->dll); 353 mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingDLLcodec,sh_video->codec->dll);
368 mp_msg(MSGT_DECVIDEO,MSGL_HINT,"Maybe you forget to upgrade your win32 codecs?? It's time to download the new\n"); 354 mp_msg(MSGT_DECVIDEO,MSGL_HINT,"Maybe you forget to upgrade your win32 codecs?? It's time to download the new\n");
369 mp_msg(MSGT_DECVIDEO,MSGL_HINT,"package from: ftp://mplayerhq.hu/MPlayer/releases/w32codec.zip !\n"); 355 mp_msg(MSGT_DECVIDEO,MSGL_HINT,"package from: ftp://mplayerhq.hu/MPlayer/releases/w32codec.zip !\n");
370 // mp_msg(MSGT_DECVIDEO,MSGL_HINT,"Or you should disable DShow support: make distclean;make -f Makefile.No-DS\n"); 356 // mp_msg(MSGT_DECVIDEO,MSGL_HINT,"Or you should disable DShow support: make distclean;make -f Makefile.No-DS\n");