aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/ffmpeg-0.9/avutil.pas
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-07-14 12:17:43 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-07-14 12:17:43 +0000
commit7c1b9be0d3462a15c9b37a1388e8d9910a8f6f96 (patch)
tree5f99a5e170a6724256386caf6d6a591149278255 /src/lib/ffmpeg-0.9/avutil.pas
parent224fbfe4b038940bb16106bf1b606f0513833a21 (diff)
downloadusdx-7c1b9be0d3462a15c9b37a1388e8d9910a8f6f96.tar.gz
usdx-7c1b9be0d3462a15c9b37a1388e8d9910a8f6f96.tar.xz
usdx-7c1b9be0d3462a15c9b37a1388e8d9910a8f6f96.zip
fix size_t for Delphi. fix duplicate packet procedures in avformat and avcodec.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2919 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/lib/ffmpeg-0.9/avutil.pas10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/lib/ffmpeg-0.9/avutil.pas b/src/lib/ffmpeg-0.9/avutil.pas
index 9a2ef4ed..acb06237 100644
--- a/src/lib/ffmpeg-0.9/avutil.pas
+++ b/src/lib/ffmpeg-0.9/avutil.pas
@@ -78,6 +78,13 @@ const
{$MESSAGE Error 'Linked version of libavutil is not yet supported!'}
{$IFEND}
+type
+{$IFNDEF FPC}
+ // defines for Delphi
+ size_t = cardinal;
+{$ENDIF}
+ Psize_t = ^size_t;
+
(**
* Return the LIBAVUTIL_VERSION_INT constant.
*)
@@ -235,9 +242,6 @@ begin
Result := (ord(d) or (ord(c) shl 8) or (ord(b) shl 16) or (ord(a) shl 24));
end;
-type
- Psize_t = ^size_t;
-
function av_size_mult(a: size_t; b: size_t; r: Psize_t): size_t;
cdecl; external av__util;
(* To Be Implemented, March 2012 KMS *)