From 995cd023063be6f9e1bbcf59883e98ffdbb3eccb Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Sun, 15 Dec 2013 22:34:37 +0000
Subject: change the defined symbols.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3034 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
src/lib/ffmpeg-1.2/avformat.pas | 41 ++++++++++++++++++++---------------------
1 file changed, 20 insertions(+), 21 deletions(-)
(limited to 'src')
diff --git a/src/lib/ffmpeg-1.2/avformat.pas b/src/lib/ffmpeg-1.2/avformat.pas
index 39fefc75..1a4453be 100644
--- a/src/lib/ffmpeg-1.2/avformat.pas
+++ b/src/lib/ffmpeg-1.2/avformat.pas
@@ -94,42 +94,41 @@ const
* dropped at a future version bump. The defines themselves are not part of
* the public API and may change, break or disappear at any time.
*)
-const
{$ifndef FF_API_OLD_AVIO}
- FF_API_OLD_AVIO = (LIBAVFORMAT_VERSION_MAJOR < 55);
+{$define FF_API_OLD_AVIO := (LIBAVFORMAT_VERSION_MAJOR < 55)}
{$endif}
{$ifndef FF_API_PKT_DUMP}
- FF_API_PKT_DUMP = (LIBAVFORMAT_VERSION_MAJOR < 54);
+{$define FF_API_PKT_DUMP := (LIBAVFORMAT_VERSION_MAJOR < 54)}
{$endif}
{$ifndef FF_API_ALLOC_OUTPUT_CONTEXT}
- FF_API_ALLOC_OUTPUT_CONTEXT = (LIBAVFORMAT_VERSION_MAJOR < 55);
+{$define FF_API_ALLOC_OUTPUT_CONTEXT := (LIBAVFORMAT_VERSION_MAJOR < 55)}
{$endif}
{$ifndef FF_API_FORMAT_PARAMETERS}
- FF_API_FORMAT_PARAMETERS = (LIBAVFORMAT_VERSION_MAJOR < 55);
+{$define FF_API_FORMAT_PARAMETERS := (LIBAVFORMAT_VERSION_MAJOR < 55)}
{$endif}
{$ifndef FF_API_NEW_STREAM}
- FF_API_NEW_STREAM = (LIBAVFORMAT_VERSION_MAJOR < 55);
+{$define FF_API_NEW_STREAM := (LIBAVFORMAT_VERSION_MAJOR < 55)}
{$endif}
{$ifndef FF_API_SET_PTS_INFO}
- FF_API_SET_PTS_INFO = (LIBAVFORMAT_VERSION_MAJOR < 55);
+{$define FF_API_SET_PTS_INFO := (LIBAVFORMAT_VERSION_MAJOR < 55)}
{$endif}
{$ifndef FF_API_CLOSE_INPUT_FILE}
- FF_API_CLOSE_INPUT_FILE = (LIBAVFORMAT_VERSION_MAJOR < 55);
+{$define FF_API_CLOSE_INPUT_FILE := (LIBAVFORMAT_VERSION_MAJOR < 55)}
{$endif}
{$ifndef FF_API_APPLEHTTP_PROTO}
- FF_API_APPLEHTTP_PROTO = (LIBAVFORMAT_VERSION_MAJOR < 55);
+{$define FF_API_APPLEHTTP_PROTO := (LIBAVFORMAT_VERSION_MAJOR < 55)}
{$endif}
{$ifndef FF_API_READ_PACKET}
- FF_API_READ_PACKET = (LIBAVFORMAT_VERSION_MAJOR < 55);
+{$define FF_API_READ_PACKET := (LIBAVFORMAT_VERSION_MAJOR < 55)}
{$endif}
{$ifndef FF_API_INTERLEAVE_PACKET}
- FF_API_INTERLEAVE_PACKET = (LIBAVFORMAT_VERSION_MAJOR < 55);
+{$define FF_API_INTERLEAVE_PACKET := (LIBAVFORMAT_VERSION_MAJOR < 55)}
{$endif}
{$ifndef FF_API_AV_GETTIME}
- FF_API_AV_GETTIME = (LIBAVFORMAT_VERSION_MAJOR < 55);
+{$define FF_API_AV_GETTIME := (LIBAVFORMAT_VERSION_MAJOR < 55)}
{$endif}
{$ifndef FF_API_R_FRAME_RATE}
- FF_API_R_FRAME_RATE = (LIBAVFORMAT_VERSION_MAJOR < 55);
+{$define FF_API_R_FRAME_RATE := (LIBAVFORMAT_VERSION_MAJOR < 55)}
{$endif}
(**
@@ -855,7 +854,7 @@ type
* not actually used for encoding.
*)
codec: PAVCodecContext; (**< codec context *)
-{$IF FF_API_R_FRAME_RATE}
+{$IFDEF FF_API_R_FRAME_RATE}
(**
* Real base framerate of the stream.
* This is the lowest framerate with which all timestamps can be
@@ -1537,14 +1536,14 @@ function av_new_program(s: PAVFormatContext; id: cint): PAVProgram;
* @}
*)
-{$IF FF_API_PKT_DUMP}
+{$IFDEF FF_API_PKT_DUMP}
procedure av_pkt_dump(f: PAVFile; pkt: PAVPacket; dump_payload: cint); {deprecated}
cdecl; external av__format;
procedure av_pkt_dump_log(avcl: Pointer; level: cint; pkt: PAVPacket; dump_payload: cint); {deprecated}
cdecl; external av__format;
{$IFEND}
-{$IF FF_API_ALLOC_OUTPUT_CONTEXT}
+{$IFDEF FF_API_ALLOC_OUTPUT_CONTEXT}
(**
* @deprecated deprecated in favor of avformat_alloc_output_context2()
*)
@@ -1663,7 +1662,7 @@ function avformat_open_input(ps: PPAVFormatContext; filename: {const} PAnsiChar;
function av_demuxer_open(ic: PAVFormatContext): cint;
cdecl; external av__format; deprecated;
-{$IF FF_API_FORMAT_PARAMETERS}
+{$IFDEF FF_API_FORMAT_PARAMETERS}
(**
* Read packets of a media file to get stream information. This
* is useful for file formats with no headers such as MPEG. This
@@ -1822,7 +1821,7 @@ function av_read_play(s: PAVFormatContext): cint;
function av_read_pause(s: PAVFormatContext): cint;
cdecl; external av__format;
-{$IF FF_API_CLOSE_INPUT_FILE}
+{$IFDEF FF_API_CLOSE_INPUT_FILE}
(**
* @deprecated use avformat_close_input()
* Close a media file (but not its codecs).
@@ -1843,7 +1842,7 @@ procedure avformat_close_input(s: PPAVFormatContext);
* @}
*)
-{$IF FF_API_NEW_STREAM}
+{$IFDEF FF_API_NEW_STREAM}
(**
* Add a new stream to a media file.
*
@@ -1858,7 +1857,7 @@ function av_new_stream(s: PAVFormatContext; id: cint): PAVStream;
cdecl; external av__format;
{$IFEND}
-{$IF FF_API_SET_PTS_INFO}
+{$IFDEF FF_API_SET_PTS_INFO}
(**
* @deprecated this function is not supposed to be called outside of lavf
*)
@@ -1924,7 +1923,7 @@ function avformat_write_header(s: PAVFormatContext; options: {PPAVDictionary} po
function av_interleaved_write_frame(s: PAVFormatContext; var pkt: TAVPacket): cint;
cdecl; external av__format;
-{$IF FF_API_INTERLEAVE_PACKET}
+{$IFDEF FF_API_INTERLEAVE_PACKET}
(**
* @deprecated this function was never meant to be called by the user
* programs.
--
cgit v1.2.3