From c227fad8311d25fc5f91b1b959e7b45f543ca0be Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sun, 16 May 2010 18:29:31 +0000 Subject: different way for conditional compilation git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2376 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/avutil.pas | 9 ++++----- 1 file 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 (* -- cgit v1.2.3