updating directshow support with avifile/mplayer changes

CVS patchset: 1357
CVS date: 2002/01/06 18:56:19

1 files changed, 13 insertions, 15 deletions

diff --git a/src/libw32dll/DirectShow/cmediasample.h b/src/libw32dll/DirectShow/cmediasample.h
index 061566cc1..3d6e1218c 100644
--- a/src/libw32dll/DirectShow/cmediasample.h
+++ b/src/libw32dll/DirectShow/cmediasample.h
@@ -4,31 +4,29 @@
 #include "interfaces.h"
 #include "guids.h"
 
-typedef struct _CMediaSample
+typedef struct _CMediaSample CMediaSample;
+struct _CMediaSample
 {
-    IMediaSample_vt *vt;
-        
+    IMediaSample_vt* vt;
+    DECLARE_IUNKNOWN();
     IMemAllocator* all;
     int size;
     int actual_size;
     char* block;
     char* own_block;
-    int refcount;
     int isPreroll;
     int isSyncPoint;
+    int isDiscontinuity;
+    LONGLONG time_start;
+    LONGLONG time_end;
     AM_MEDIA_TYPE media_type;
     int type_valid;
-    
-    /*
-    CMediaSample(IMemAllocator* allocator, long _size);
-    ~CMediaSample();
-    */ 
-    
-    void (*SetPointer)(struct _CMediaSample *this, char* pointer);
-    void (*ResetPointer)(struct _CMediaSample *this);
-} CMediaSample;
+    void ( *SetPointer) (CMediaSample* This, char* pointer);
+    void ( *ResetPointer) (CMediaSample* This); // FIXME replace with Set & 0
+};
 
-CMediaSample * CMediaSample_Create(IMemAllocator* allocator, long _size);
-void CMediaSample_Destroy(CMediaSample *this);
+CMediaSample* CMediaSampleCreate(IMemAllocator* allocator, int _size);
+// called from allocator
+void CMediaSample_Destroy(CMediaSample* This);
 
 #endif /* DS_CMEDIASAMPLE_H */