Merged VSFilterMod rev20, only 64 bit code enabled for the time being

git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1688 10f7b99b-c216-0410-bff0-8a66a9350fd8

2 files changed, 2 insertions, 2 deletions

diff --git a/include/avisynth/avisynth1.h b/include/avisynth/avisynth1.h
index ce0089f1f..070820356 100644
--- a/include/avisynth/avisynth1.h
+++ b/include/avisynth/avisynth1.h
@@ -135,7 +135,7 @@ class VideoFrame {
 

   VideoFrame(VideoFrameBuffer* _vfb, int _offset, int _pitch, int _row_size, int _height);

 

-  void* operator new(unsigned size);

+  void* operator new(size_t size);

 

 public:

   int GetPitch() const { return pitch; }

diff --git a/include/avisynth/avisynth25.h b/include/avisynth/avisynth25.h
index 21de2eca4..b8bf791c1 100644
--- a/include/avisynth/avisynth25.h
+++ b/include/avisynth/avisynth25.h
@@ -305,7 +305,7 @@ class VideoFrame {
   VideoFrame(VideoFrameBuffer* _vfb, int _offset, int _pitch, int _row_size, int _height);

   VideoFrame(VideoFrameBuffer* _vfb, int _offset, int _pitch, int _row_size, int _height, int _offsetU, int _offsetV, int _pitchUV);

 

-  void* operator new(unsigned size);

+  void* operator new(size_t size);

 // TESTME: OFFSET U/V may be switched to what could be expected from AVI standard!

 public:

   int GetPitch() const { return pitch; }