diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-05-16 18:29:31 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-05-16 18:29:31 +0000 |
| commit | c227fad8311d25fc5f91b1b959e7b45f543ca0be (patch) | |
| tree | 3f29a2693b3fbe84181f685894b5b00ed00eb8ad | |
| parent | 376d801304e16e522c50dffd02dc2b82d934efb8 (diff) | |
| download | usdx-c227fad8311d25fc5f91b1b959e7b45f543ca0be.tar.gz usdx-c227fad8311d25fc5f91b1b959e7b45f543ca0be.tar.xz usdx-c227fad8311d25fc5f91b1b959e7b45f543ca0be.zip | |
different way for conditional compilation
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2376 b956fd51-792f-4845-bead-9b4dfca2ff2c
| -rw-r--r-- | src/lib/ffmpeg/avutil.pas | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas index 4f344e14..385b7e3d 100644 --- a/src/lib/ffmpeg/avutil.pas +++ b/src/lib/ffmpeg/avutil.pas @@ -160,11 +160,11 @@ type (* libavutil/error.h *) -{$MESSAGE Warning 'libavutil marker'} - {$IF LIBAVUTIL_VERSION >= 50012000} // >= 50.12.0 + {$DEFINE NEED_ERRORS_HERE} +{$IFEND} -{$MESSAGE Warning 'LIBAVUTIL_VERSION >= 50012000!'} +{$IFDEF NEED_ERRORS_HERE} {* error handling *} @@ -194,7 +194,6 @@ const {$ENDIF} const -{$MESSAGE Warning 'You should not get this libavutil marker!!!'} {$IF EINVAL > 0} AVERROR_SIGN = -1; {$ELSE} @@ -228,7 +227,7 @@ const // Note: function calls as constant-initializers are invalid //AVERROR_PATCHWELCOME = -MKTAG('P','A','W','E'); {**< Not yet implemented in FFmpeg. Patches welcome. *} AVERROR_PATCHWELCOME = -(ord('P') or (ord('A') shl 8) or (ord('W') shl 16) or (ord('E') shl 24)); -{$IFEND} +{$ENDIF} {$IF LIBAVUTIL_VERSION >= 50013000} // >= 50.13.0 (* |