Fixes FfmpegDecoder AccessViolationException on 32 bit systems

daholive · Mar 25, 2018 · 8e269f5 · 8e269f5
1 parent 7067a75
commit 8e269f5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CSCore.Ffmpeg/FfmpegCalls.cs b/CSCore.Ffmpeg/FfmpegCalls.cs
@@ -22,10 +22,13 @@ public enum SeekFlags
             SeekForce = 0x20000
         }
 
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         public delegate int AvioReadData(IntPtr opaque, IntPtr buffer, int bufferSize);
 
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         public delegate int AvioWriteData(IntPtr opaque, IntPtr buffer, int bufferSize);
 
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         public delegate long AvioSeek(IntPtr opaque, long offset, SeekFlags whence);
 
         static FfmpegCalls()

diff --git a/CSCore.Ffmpeg/FfmpegLogReceivedEventArgs.cs b/CSCore.Ffmpeg/FfmpegLogReceivedEventArgs.cs
@@ -57,6 +57,7 @@ public class FfmpegLogReceivedEventArgs : EventArgs
         /// </value>
         public string ParentLogContextItemName { get; set; }
 
+        [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
         private delegate IntPtr ItemNameFunc(IntPtr avClass);
 
         internal unsafe FfmpegLogReceivedEventArgs(AVClass? avClass, AVClass? parentLogContext, LogLevel level, string line, void* ptr, void* ptr1)