From 1134c269bc63a37f89e85079231a2226c4a47c82 Mon Sep 17 00:00:00 2001 From: arpi Date: Thu, 16 Aug 2001 18:39:49 +0000 Subject: fixes git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1560 b3059339-0415-0410-9bf9-f77b7e298cf2 --- loader/dshow/DS_VideoDec.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'loader') diff --git a/loader/dshow/DS_VideoDec.c b/loader/dshow/DS_VideoDec.c index 1f80d163fd..d3d8ce2d12 100644 --- a/loader/dshow/DS_VideoDec.c +++ b/loader/dshow/DS_VideoDec.c @@ -1,9 +1,9 @@ #include "guids.h" #include "interfaces.h" +#include "libwin32.h" #include "DS_VideoDecoder.h" #include -#include //#include #include @@ -33,8 +33,13 @@ extern "C" int DS_VideoDecoder_Open(char* dllname, GUID* guid, BITMAPINFOHEADER* CodecInfo ci; ci.dll=dllname; ci.guid=*guid; - - DS_VideoDecoder* dec=new DS_VideoDecoder(ci, *format, flip); + +// try { + DS_VideoDecoder* dec=new DS_VideoDecoder(ci, *format, flip); +// } catch (FatalError &e) { +// _handle=NULL; +// return -1; +// } _d_ptr=d_ptr; _handle=(void*)dec; @@ -56,13 +61,15 @@ extern "C" void DS_VideoDecoder_Restart(){ } extern "C" void DS_VideoDecoder_Close(){ + DS_VideoDecoder* dec=(DS_VideoDecoder*) _handle; + delete dec; } extern "C" int DS_VideoDecoder_DecodeFrame(char* src, int size, int is_keyframe, int render){ DS_VideoDecoder* dec=(DS_VideoDecoder*) _handle; CImage image; image.ptr=*_d_ptr; - return dec->DecodeInternal((void*)src,(size_t)size,is_keyframe,&image); + return dec->Decode((void*)src,(size_t)size,is_keyframe,&image); } extern "C" int DS_VideoDecoder_SetDestFmt(int bits, int csp){ -- cgit v1.2.3