summaryrefslogtreecommitdiff
path: root/src/libw32dll/DirectShow
diff options
context:
space:
mode:
Diffstat (limited to 'src/libw32dll/DirectShow')
-rw-r--r--src/libw32dll/DirectShow/Makefile.am6
-rw-r--r--src/libw32dll/DirectShow/inputpin.c8
-rw-r--r--src/libw32dll/DirectShow/iunk.h3
3 files changed, 6 insertions, 11 deletions
diff --git a/src/libw32dll/DirectShow/Makefile.am b/src/libw32dll/DirectShow/Makefile.am
index 06f770682..5593e3894 100644
--- a/src/libw32dll/DirectShow/Makefile.am
+++ b/src/libw32dll/DirectShow/Makefile.am
@@ -3,12 +3,10 @@ noinst_LTLIBRARIES = libds_filter.la
noinst_HEADERS = DS_Filter.h allocator.h cmediasample.h \
guids.h inputpin.h interfaces.h iunk.h outputpin.h \
- DS_AudioDecoder.h
-# DS_VideoDecoder.h
+ DS_AudioDecoder.h DS_VideoDecoder.h
libds_filter_la_SOURCES = guids.c inputpin.c outputpin.c allocator.c \
- cmediasample.c DS_Filter.c DS_AudioDecoder.c
-# DS_VideoDecoder.c
+ cmediasample.c DS_Filter.c DS_AudioDecoder.c DS_VideoDecoder.c
##
##
diff --git a/src/libw32dll/DirectShow/inputpin.c b/src/libw32dll/DirectShow/inputpin.c
index c20c16811..76908f831 100644
--- a/src/libw32dll/DirectShow/inputpin.c
+++ b/src/libw32dll/DirectShow/inputpin.c
@@ -102,10 +102,8 @@ CEnumPins * CEnumPins_Create(IPin* p, IPin* pp)
this->vt=malloc(sizeof(IEnumPins_vt));
- this->pin1 = malloc(sizeof(IPin));
- memcpy(this->pin1,p,sizeof(IPin));
- this->pin2 = malloc(sizeof(IPin));
- memcpy(this->pin2,pp,sizeof(IPin));
+ this->pin1 = p;
+ this->pin2 = pp;
this->counter = 0;
this->refcount = 1;
@@ -248,6 +246,8 @@ CInputPin * CInputPin_Create(CBaseFilter* p, const AM_MEDIA_TYPE *vh)
{
CInputPin *this;
this = malloc(sizeof(CInputPin));
+
+ Debug printf("CInputPin_Create %p\n", this );
memcpy(&this->type,vh,sizeof(AM_MEDIA_TYPE));
this->refcount = 1;
diff --git a/src/libw32dll/DirectShow/iunk.h b/src/libw32dll/DirectShow/iunk.h
index 2c672b374..cf139b924 100644
--- a/src/libw32dll/DirectShow/iunk.h
+++ b/src/libw32dll/DirectShow/iunk.h
@@ -4,9 +4,6 @@
#include "guids.h"
#define DECLARE_IUNKNOWN(CLASSNAME) \
- long STDCALL (*QueryInterface)(IUnknown * This, GUID* riid, void **ppvObject); \
- long STDCALL (*AddRef) (IUnknown * This); \
- long STDCALL (*Release) (IUnknown * This); \
int refcount;
#define INHERIT_IUNKNOWN() \