diff options
| author | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2014-12-26 22:17:56 +0000 |
|---|---|---|
| committer | brian-ch <brian-ch@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2014-12-26 22:17:56 +0000 |
| commit | 22a2a88736de35e934ebd66ba576cf45f0ec4a57 (patch) | |
| tree | 689e388c3b6994bc78d0871e5c60c646fe005cb3 /src/lib/ffmpeg-2.4/avutil.pas | |
| parent | b28cd725d82fbe0259695c508715c27d7aaacb40 (diff) | |
| download | usdx-22a2a88736de35e934ebd66ba576cf45f0ec4a57.tar.gz usdx-22a2a88736de35e934ebd66ba576cf45f0ec4a57.tar.xz usdx-22a2a88736de35e934ebd66ba576cf45f0ec4a57.zip | |
Fix FF_API defines for ffmpeg 2.4, it should work now.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@3108 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/lib/ffmpeg-2.4/avutil.pas')
| -rw-r--r-- | src/lib/ffmpeg-2.4/avutil.pas | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/src/lib/ffmpeg-2.4/avutil.pas b/src/lib/ffmpeg-2.4/avutil.pas index fd4c83fd..1987d02a 100644 --- a/src/lib/ffmpeg-2.4/avutil.pas +++ b/src/lib/ffmpeg-2.4/avutil.pas @@ -81,76 +81,6 @@ const {$MESSAGE Error 'Linked version of libavutil is not yet supported!'} {$IFEND} - -(** - * @} - * - * @defgroup depr_guards Deprecation guards - * FF_API_* defines may be placed below to indicate public API that will be - * 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. - * - * @{ - *) - -{$ifndef FF_API_GET_BITS_PER_SAMPLE_FMT} -{$define FF_API_GET_BITS_PER_SAMPLE_FMT := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_FIND_OPT} -{$define FF_API_FIND_OPT := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_OLD_AVOPTIONS} -{$define FF_API_OLD_AVOPTIONS := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_PIX_FMT} -{$define FF_API_PIX_FMT := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_CONTEXT_SIZE} -{$define FF_API_CONTEXT_SIZE := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_PIX_FMT_DESC} -{$define FF_API_PIX_FMT_DESC := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_AV_REVERSE} -{$define FF_API_AV_REVERSE := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_AUDIOCONVERT} -{$define FF_API_AUDIOCONVERT := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_CPU_FLAG_MMX2} -{$define FF_API_CPU_FLAG_MMX2 := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_SAMPLES_UTILS_RETURN_ZERO} -{$define FF_API_SAMPLES_UTILS_RETURN_ZERO := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_LLS_PRIVATE} -{$define FF_API_LLS_PRIVATE := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_LLS1} -{$define FF_API_LLS1 :=(LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_AVFRAME_LAVC} -{$define FF_API_AVFRAME_LAVC := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_VDPAU} -{$define FF_API_VDPAU := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT} -{$define FF_API_GET_CHANNEL_LAYOUT_COMPAT := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_OLD_OPENCL} -{$define FF_API_OLD_OPENCL := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_XVMC} -{$define FF_API_XVMC := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_INTFLOAT -{$define FF_API_INTFLOAT := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} -{$ifndef FF_API_OPT_TYPE_METADATA} -{$define FF_API_OPT_TYPE_METADATA := (LIBAVUTIL_VERSION_MAJOR < 54)} -{$endif} - type {$IFNDEF FPC} // defines for Delphi |