same procedure for avformat as for avcodec.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2916 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 27 insertions, 29 deletions

diff --git a/src/lib/ffmpeg-0.10/avformat.pas b/src/lib/ffmpeg-0.10/avformat.pas
index 20607ecc..eab33a63 100644
--- a/src/lib/ffmpeg-0.10/avformat.pas
+++ b/src/lib/ffmpeg-0.10/avformat.pas
@@ -96,86 +96,84 @@ const
  * Those FF_API_* defines are not part of public API.
  * They may change, break or disappear at any time.
  *)
-{$IFDEF FPC}
-  {$macro on}
-{$ENDIF}
+const
 {$ifndef FF_API_OLD_METADATA2}
-{$define FF_API_OLD_METADATA2 := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_OLD_METADATA2 = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_OLD_AVIO}
-{$define FF_API_OLD_AVIO := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_OLD_AVIO = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_DUMP_FORMAT}
-{$define FF_API_DUMP_FORMAT := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_DUMP_FORMAT = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_PARSE_DATE}
-{$define FF_API_PARSE_DATE := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_PARSE_DATE = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_FIND_INFO_TAG}
-{$define FF_API_FIND_INFO_TAG := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_FIND_INFO_TAG = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_PKT_DUMP}
-{$define FF_API_PKT_DUMP := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_PKT_DUMP = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_GUESS_IMG2_CODEC}
-{$define FF_API_GUESS_IMG2_CODEC := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_GUESS_IMG2_CODEC = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_SDP_CREATE}
-{$define FF_API_SDP_CREATE := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_SDP_CREATE = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_ALLOC_OUTPUT_CONTEXT}
-{$define FF_API_ALLOC_OUTPUT_CONTEXT := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_ALLOC_OUTPUT_CONTEXT = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_FORMAT_PARAMETERS}
-{$define FF_API_FORMAT_PARAMETERS := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_FORMAT_PARAMETERS = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_FLAG_RTP_HINT}
-{$define FF_API_FLAG_RTP_HINT := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_FLAG_RTP_HINT = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_AVSTREAM_QUALITY}
-{$define FF_API_AVSTREAM_QUALITY := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_AVSTREAM_QUALITY = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_LOOP_INPUT}
-{$define FF_API_LOOP_INPUT := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_LOOP_INPUT = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_LOOP_OUTPUT}
-{$define FF_API_LOOP_OUTPUT := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_LOOP_OUTPUT = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_TIMESTAMP}
-{$define FF_API_TIMESTAMP := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_TIMESTAMP = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_FILESIZE}
-{$define FF_API_FILESIZE := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_FILESIZE = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_MUXRATE}
-{$define FF_API_MUXRATE := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_MUXRATE = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_RTSP_URL_OPTIONS}
-{$define FF_API_RTSP_URL_OPTIONS := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_RTSP_URL_OPTIONS = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_NEW_STREAM}
-{$define FF_API_NEW_STREAM := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_NEW_STREAM = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_PRELOAD}
-{$define FF_API_PRELOAD := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_PRELOAD = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_STREAM_COPY}
-{$define FF_API_STREAM_COPY := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_STREAM_COPY = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_SEEK_PUBLIC}
-{$define FF_API_SEEK_PUBLIC := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_SEEK_PUBLIC = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_REORDER_PRIVATE}
-{$define FF_API_REORDER_PRIVATE := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_REORDER_PRIVATE = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_OLD_INTERRUPT_CB}
-{$define FF_API_OLD_INTERRUPT_CB := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_OLD_INTERRUPT_CB = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_SET_PTS_INFO}
-{$define FF_API_SET_PTS_INFO := (LIBAVFORMAT_VERSION_MAJOR < 54)}
+  FF_API_SET_PTS_INFO = (LIBAVFORMAT_VERSION_MAJOR < 54);
 {$endif}
 {$ifndef FF_API_CLOSE_INPUT_FILE}
-{$define FF_API_CLOSE_INPUT_FILE := (LIBAVFORMAT_VERSION_MAJOR < 55)}
+  FF_API_CLOSE_INPUT_FILE = (LIBAVFORMAT_VERSION_MAJOR < 55);
 {$endif}
 
 (**