diff options
author | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-05-06 21:43:45 +0000 |
---|---|---|
committer | arpi_esp <arpi_esp@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-05-06 21:43:45 +0000 |
commit | c8b40d3bd00cab519ea4e55116332efd12f9b381 (patch) | |
tree | 51c56b549f24c395c830c196fc099e0240c4fc21 /loader/dshow/outputpin.h | |
parent | 0742d52b569e69d3df278afb388abd76e384b7c8 (diff) | |
download | mpv-c8b40d3bd00cab519ea4e55116332efd12f9b381.tar.bz2 mpv-c8b40d3bd00cab519ea4e55116332efd12f9b381.tar.xz |
avifile-0.6-CVS merge
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@714 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'loader/dshow/outputpin.h')
-rw-r--r-- | loader/dshow/outputpin.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/loader/dshow/outputpin.h b/loader/dshow/outputpin.h index f1cc36ee5e..ab516e1506 100644 --- a/loader/dshow/outputpin.h +++ b/loader/dshow/outputpin.h @@ -5,7 +5,7 @@ #include "interfaces.h" #include "guids.h" #include "default.h" - +#include "allocator.h" class COutputPin: public IPin, public IMemInputPin { int refcount; @@ -13,10 +13,12 @@ class COutputPin: public IPin, public IMemInputPin IPin* remote; char** frame_pointer; long* frame_size_pointer; + MemAllocator* pAllocator; public: COutputPin(const AM_MEDIA_TYPE& vhdr); - ~COutputPin(){delete IPin::vt; delete IMemInputPin::vt;} + ~COutputPin(); void SetFramePointer(char** z){frame_pointer=z;} + void SetPointer2(char* p) { if(pAllocator) pAllocator->SetPointer(p); } void SetFrameSizePointer(long* z){frame_size_pointer=z;} void SetNewFormat(const AM_MEDIA_TYPE& a){type=a;} static HRESULT STDCALL QueryInterface(IUnknown* This, GUID* iid, void** ppv); |