From cb653bfae1eac2c6c98d7fdfd1ef500a6d0c2e85 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 9 Jul 2012 22:18:24 +0000
Subject: more fixing ends of macros for Delphi 7.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2907 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg-0.10/avcodec.pas  | 4 +++-
 src/lib/ffmpeg-0.10/avformat.pas | 8 +++++---
 src/lib/ffmpeg-0.10/avio.pas     | 8 ++++----
 src/lib/ffmpeg-0.10/swscale.pas  | 4 ++--
 4 files changed, 14 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/lib/ffmpeg-0.10/avcodec.pas b/src/lib/ffmpeg-0.10/avcodec.pas
index 5d11f04b..f3bb4bd3 100644
--- a/src/lib/ffmpeg-0.10/avcodec.pas
+++ b/src/lib/ffmpeg-0.10/avcodec.pas
@@ -109,7 +109,9 @@ const
  * Those FF_API_* defines are not part of public API.
  * They may change, break or disappear at any time.
  *)
-{$macro on}
+{$IFDEF FPC}
+  {$macro on}
+{$ENDIF
 {$ifndef FF_API_PALETTE_CONTROL}
 {$define FF_API_PALETTE_CONTROL := (LIBAVCODEC_VERSION_MAJOR < 54)}
 {$endif}
diff --git a/src/lib/ffmpeg-0.10/avformat.pas b/src/lib/ffmpeg-0.10/avformat.pas
index f9b4bd4c..94e0781b 100644
--- a/src/lib/ffmpeg-0.10/avformat.pas
+++ b/src/lib/ffmpeg-0.10/avformat.pas
@@ -96,7 +96,9 @@ const
  * Those FF_API_* defines are not part of public API.
  * They may change, break or disappear at any time.
  *)
-{$macro on}
+{$IFDEF FPC}
+  {$macro on}
+{$ENDIF}
 {$ifndef FF_API_OLD_METADATA2}
 {$define FF_API_OLD_METADATA2 := (LIBAVFORMAT_VERSION_MAJOR < 54)}
 {$endif}
@@ -360,7 +362,7 @@ type
  * @}
  *)
 
-{$IF FF_API_OLD_METADATA2}
+{$IFDEF FF_API_OLD_METADATA2}
 (**
  * @defgroup old_metadata Old metadata API
  * The following functions are deprecated, use
@@ -689,7 +691,7 @@ type
 
     subtitle_codec: TCodecID; (**< default subtitle codec *)
 
-{$IF FF_API_OLD_METADATA2}
+{$IFDEF FF_API_OLD_METADATA2}
     {const} metadata_conv: PAVMetadataConv;
 {$ENDIF}
 
diff --git a/src/lib/ffmpeg-0.10/avio.pas b/src/lib/ffmpeg-0.10/avio.pas
index abeec968..61097c69 100644
--- a/src/lib/ffmpeg-0.10/avio.pas
+++ b/src/lib/ffmpeg-0.10/avio.pas
@@ -161,7 +161,7 @@ type
     must_flush: cint;    (**< true if the next seek should flush *)
     eof_reached: cint;   (**< true if eof reached *)
     write_flag: cint;    (**< true if open for writing *)
-{$IF FF_API_OLD_AVIO}
+{$IFDEF FF_API_OLD_AVIO}
     is_streamed: cint; { deprecated }
 {$ENDIF}
     max_packet_size: cint;
@@ -194,7 +194,7 @@ type
 
 (* unbuffered I/O *)
 
-{$IF FF_API_OLD_AVIO}
+{$IFDEF FF_API_OLD_AVIO}
   PURLProtocol = ^TURLProtocol;
 
 (**
@@ -556,7 +556,7 @@ function avio_check(url: {const} PAnsiChar; flags: cint): cint;
  *)
 procedure avio_set_interrupt_cb(interrupt_cb: Pointer);
   cdecl; external av__format; deprecated;
-{$IFEND}
+{$ENDIF}
 
 (**
  * Allocate and initialize an AVIOContext for buffered I/O. It must be later
@@ -898,7 +898,7 @@ function url_is_streamed(s: PAVIOContext): cint;
 begin
   Result := s^.is_streamed;
 end;
-{$ENDIF}
+{$IFEND}
 
 (**
  * For SEEK_CUR on Windows
diff --git a/src/lib/ffmpeg-0.10/swscale.pas b/src/lib/ffmpeg-0.10/swscale.pas
index 9fb088b9..33263645 100644
--- a/src/lib/ffmpeg-0.10/swscale.pas
+++ b/src/lib/ffmpeg-0.10/swscale.pas
@@ -154,7 +154,7 @@ const
   SWS_ACCURATE_RND      = $40000;
   SWS_BITEXACT          = $80000;
 
-{$IF FF_API_SWS_CPU_CAPS}
+{$IFDEF FF_API_SWS_CPU_CAPS}
 (**
  * CPU caps are autodetected now, those flags
  * are only provided for API compatibility.
@@ -249,7 +249,7 @@ function sws_init_context(sws_context: PSwsContext; srcFilter: PSwsFilter; dstFi
 procedure sws_freeContext(swsContext: PSwsContext);
   cdecl; external sw__scale;
 
-{$IF FF_API_SWS_GETCONTEXT}
+{$IFDEF FF_API_SWS_GETCONTEXT}
 (**
  * Allocate and return a SwsContext. You need it to perform
  * scaling/conversion operations using sws_scale().
-- 
cgit v1.2.3