diff options
author | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-03-03 14:00:02 +0000 |
---|---|---|
committer | tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2008-03-03 14:00:02 +0000 |
commit | ddf0dc62ba1e3bd772e8155d295ddb3487d5d305 (patch) | |
tree | 801dd2d41e17fb33e0fe9ddef81214edb407df56 /Game/Code/lib/ffmpeg | |
parent | 71115fe4d1873e61101f2ceb2c99fc3554ac4171 (diff) | |
download | usdx-ddf0dc62ba1e3bd772e8155d295ddb3487d5d305.tar.gz usdx-ddf0dc62ba1e3bd772e8155d295ddb3487d5d305.tar.xz usdx-ddf0dc62ba1e3bd772e8155d295ddb3487d5d305.zip |
delphi 7 compatibility (inline was introduced with delphi 2005)
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@902 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/lib/ffmpeg')
-rw-r--r-- | Game/Code/lib/ffmpeg/avformat.pas | 4 | ||||
-rw-r--r-- | Game/Code/lib/ffmpeg/avio.pas | 4 | ||||
-rw-r--r-- | Game/Code/lib/ffmpeg/rational.pas | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/Game/Code/lib/ffmpeg/avformat.pas b/Game/Code/lib/ffmpeg/avformat.pas index 7a5678a5..dd99e18b 100644 --- a/Game/Code/lib/ffmpeg/avformat.pas +++ b/Game/Code/lib/ffmpeg/avformat.pas @@ -37,6 +37,8 @@ unit avformat; {$MINENUMSIZE 4} (* use 4-byte enums *) {$ENDIF} +{$I switches.inc} + interface uses @@ -133,7 +135,7 @@ function av_dup_packet (pkt: PAVPacket): integer; * * @param pkt packet to free *) -procedure av_free_packet (pkt: PAVPacket); inline; +procedure av_free_packet (pkt: PAVPacket); {$IFDEF HasInline}inline;{$ENDIF} (*************************************************) (* fractional numbers for exact pts handling *) diff --git a/Game/Code/lib/ffmpeg/avio.pas b/Game/Code/lib/ffmpeg/avio.pas index f3a4f05f..46d847b0 100644 --- a/Game/Code/lib/ffmpeg/avio.pas +++ b/Game/Code/lib/ffmpeg/avio.pas @@ -37,6 +37,8 @@ unit avio; {$MINENUMSIZE 4} (* use 4-byte enums *) {$ENDIF} +{$I switches.inc} + interface uses @@ -366,7 +368,7 @@ function ff_get_v(bc: PByteIOContext): uint64; cdecl; external av__format; {$IFEND} -function url_is_streamed(s: PByteIOContext): integer; inline; +function url_is_streamed(s: PByteIOContext): integer; {$IFDEF HasInline}inline;{$ENDIF} (** @note when opened as read/write, the buffers are only used for writing *) diff --git a/Game/Code/lib/ffmpeg/rational.pas b/Game/Code/lib/ffmpeg/rational.pas index 0d6f76b6..14d28162 100644 --- a/Game/Code/lib/ffmpeg/rational.pas +++ b/Game/Code/lib/ffmpeg/rational.pas @@ -36,6 +36,8 @@ unit rational; {$MINENUMSIZE 4} (* use 4-byte enums *) {$ENDIF} +{$I switches.inc} + interface uses @@ -57,14 +59,14 @@ type * @param b second rational * @return 0 if a==b, 1 if a>b and -1 if a<b. *) -function av_cmp_q(a: TAVRational; b: TAVRational): integer; inline; +function av_cmp_q(a: TAVRational; b: TAVRational): integer; {$IFDEF HasInline}inline;{$ENDIF} (** * Rational to double conversion. * @param a rational to convert * @return (double) a *) -function av_q2d(a: TAVRational): double; inline; +function av_q2d(a: TAVRational): double; {$IFDEF HasInline}inline;{$ENDIF} (** * Reduce a fraction. |