aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-07-10 11:14:36 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2012-07-10 11:14:36 +0000
commita1d0ff701756c8a187b3b53ed7d70f27809a5ea8 (patch)
tree7cbe660ed781badd767ced0714dcee0e22f0c771 /src
parent7c1ab5ca056b5d8b7373aa70fc8ed4ed1006feed (diff)
downloadusdx-a1d0ff701756c8a187b3b53ed7d70f27809a5ea8.tar.gz
usdx-a1d0ff701756c8a187b3b53ed7d70f27809a5ea8.tar.xz
usdx-a1d0ff701756c8a187b3b53ed7d70f27809a5ea8.zip
a test for debuggin.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2914 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src')
-rw-r--r--src/lib/ffmpeg-0.10/avcodec.pas65
1 files changed, 31 insertions, 34 deletions
diff --git a/src/lib/ffmpeg-0.10/avcodec.pas b/src/lib/ffmpeg-0.10/avcodec.pas
index af4680bc..139b823b 100644
--- a/src/lib/ffmpeg-0.10/avcodec.pas
+++ b/src/lib/ffmpeg-0.10/avcodec.pas
@@ -97,109 +97,106 @@ const
(* Check if linked versions are supported *)
{$IF (LIBAVCODEC_VERSION < LIBAVCODEC_MIN_VERSION)}
-// {$MESSAGE Error 'Linked version of libavcodec is too old!'}
+ {$MESSAGE Error 'Linked version of libavcodec is too old!'}
{$IFEND}
(* Check if linked version is supported *)
{$IF (LIBAVCODEC_VERSION > LIBAVCODEC_MAX_VERSION)}
-// {$MESSAGE Error 'Linked version of libavcodec is not yet supported!'}
+ {$MESSAGE Error 'Linked version of libavcodec is not yet supported!'}
{$IFEND}
(**
* 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_PALETTE_CONTROL}
-{$define FF_API_PALETTE_CONTROL := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_PALETTE_CONTROL := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_OLD_SAMPLE_FMT}
-{$define FF_API_OLD_SAMPLE_FMT := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_OLD_SAMPLE_FMT := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_OLD_AUDIOCONVERT}
-const
FF_API_OLD_AUDIOCONVERT = (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_ANTIALIAS_ALGO}
-{$define FF_API_ANTIALIAS_ALGO := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_ANTIALIAS_ALGO := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_REQUEST_CHANNELS}
-{$define FF_API_REQUEST_CHANNELS := (LIBAVCODEC_VERSION_MAJOR < 55)}
+ FF_API_REQUEST_CHANNELS := (LIBAVCODEC_VERSION_MAJOR < 55);
{$endif}
{$ifndef FF_API_OPT_H}
-{$define FF_API_OPT_H := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_OPT_H := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_THREAD_INIT}
-{$define FF_API_THREAD_INIT := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_THREAD_INIT := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_OLD_FF_PICT_TYPES}
-{$define FF_API_OLD_FF_PICT_TYPES := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_OLD_FF_PICT_TYPES := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_FLAC_GLOBAL_OPTS}
-{$define FF_API_FLAC_GLOBAL_OPTS := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_FLAC_GLOBAL_OPTS := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_GET_PIX_FMT_NAME}
-{$define FF_API_GET_PIX_FMT_NAME := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_GET_PIX_FMT_NAME := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_ALLOC_CONTEXT}
-{$define FF_API_ALLOC_CONTEXT := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_ALLOC_CONTEXT := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_AVCODEC_OPEN}
-{$define FF_API_AVCODEC_OPEN := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_AVCODEC_OPEN := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_DRC_SCALE}
-{$define FF_API_DRC_SCALE := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_DRC_SCALE := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_ER}
-{$define FF_API_ER := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_ER := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_AVCODEC_INIT}
-{$define FF_API_AVCODEC_INIT := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_AVCODEC_INIT := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_X264_GLOBAL_OPTS}
-{$define FF_API_X264_GLOBAL_OPTS := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_X264_GLOBAL_OPTS := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_MPEGVIDEO_GLOBAL_OPTS}
-//{$define FF_API_MPEGVIDEO_GLOBAL_OPTS := (LIBAVCODEC_VERSION_MAJOR < 54)}
+// FF_API_MPEGVIDEO_GLOBAL_OPTS := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_LAME_GLOBAL_OPTS}
-//{$define FF_API_LAME_GLOBAL_OPTS := (LIBAVCODEC_VERSION_MAJOR < 54)}
+// FF_API_LAME_GLOBAL_OPTS := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_SNOW_GLOBAL_OPTS}
-//{$define FF_API_SNOW_GLOBAL_OPTS := (LIBAVCODEC_VERSION_MAJOR < 54)}
+// FF_API_SNOW_GLOBAL_OPTS := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_MJPEG_GLOBAL_OPTS}
-//{$define FF_API_MJPEG_GLOBAL_OPTS := (LIBAVCODEC_VERSION_MAJOR < 54)}
+// FF_API_MJPEG_GLOBAL_OPTS := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_GET_ALPHA_INFO}
-{$define FF_API_GET_ALPHA_INFO := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_GET_ALPHA_INFO := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_PARSE_FRAME}
-{$define FF_API_PARSE_FRAME := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_PARSE_FRAME := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_INTERNAL_CONTEXT}
-{$define FF_API_INTERNAL_CONTEXT := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_INTERNAL_CONTEXT := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_TIFFENC_COMPLEVEL}
-{$define FF_API_TIFFENC_COMPLEVEL := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_TIFFENC_COMPLEVEL := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_DATA_POINTERS}
-{$define FF_API_DATA_POINTERS := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_DATA_POINTERS := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_OLD_DECODE_AUDIO}
-{$define FF_API_OLD_DECODE_AUDIO := (LIBAVCODEC_VERSION_MAJOR < 55)}
+ FF_API_OLD_DECODE_AUDIO = (LIBAVCODEC_VERSION_MAJOR < 55);
{$endif}
{$ifndef FF_API_OLD_TIMECODE}
-{$define FF_API_OLD_TIMECODE := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_OLD_TIMECODE := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_AVFRAME_AGE}
-{$define FF_API_AVFRAME_AGE := (LIBAVCODEC_VERSION_MAJOR < 54)}
+ FF_API_AVFRAME_AGE := (LIBAVCODEC_VERSION_MAJOR < 54);
{$endif}
{$ifndef FF_API_OLD_ENCODE_AUDIO}
-{$define FF_API_OLD_ENCODE_AUDIO := (LIBAVCODEC_VERSION_MAJOR < 55)}
+ FF_API_OLD_ENCODE_AUDIO := (LIBAVCODEC_VERSION_MAJOR < 55);
{$endif}
type