diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-07-10 07:00:31 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2012-07-10 07:00:31 +0000 |
| commit | c91c5e2f90efd7e61b33fa42ef2e42b9ab5676d7 (patch) | |
| tree | 885b93fe3f36c56c2f2a535c3e4f8c55e6d2298b /src/lib/ffmpeg-0.10/swscale.pas | |
| parent | 59efbcfd9ff340b3e5a34f8da6fa21b77be00eb5 (diff) | |
| download | usdx-c91c5e2f90efd7e61b33fa42ef2e42b9ab5676d7.tar.gz usdx-c91c5e2f90efd7e61b33fa42ef2e42b9ab5676d7.tar.xz usdx-c91c5e2f90efd7e61b33fa42ef2e42b9ab5676d7.zip | |
more fixes of ifdefs and similar. probably buggy.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2910 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
| -rw-r--r-- | src/lib/ffmpeg-0.10/swscale.pas | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/ffmpeg-0.10/swscale.pas b/src/lib/ffmpeg-0.10/swscale.pas index 33263645..a918aa09 100644 --- a/src/lib/ffmpeg-0.10/swscale.pas +++ b/src/lib/ffmpeg-0.10/swscale.pas @@ -80,7 +80,7 @@ const (* Check if linked versions are supported *) {$IF (LIBSWSCALE_VERSION > LIBSWSCALE_MAX_VERSION)} -// {$MESSAGE Error 'Linked version of libswscale is not yet supported!'} + {$MESSAGE Error 'Linked version of libswscale is not yet supported!'} {$IFEND} type @@ -102,7 +102,7 @@ const {$ifndef FF_API_SWS_CPU_CAPS} FF_API_SWS_CPU_CAPS = LIBSWSCALE_VERSION_MAJOR < 3; {$endif} -{$ifndef FF_API_SWS_GETCONTEXT} +{$ifndef FF_API_SWS_FORMAT_NAME} FF_API_SWS_FORMAT_NAME = LIBSWSCALE_VERSION_MAJOR < 3; {$endif} @@ -154,7 +154,7 @@ const SWS_ACCURATE_RND = $40000; SWS_BITEXACT = $80000; -{$IFDEF FF_API_SWS_CPU_CAPS} +{$IF FF_API_SWS_CPU_CAPS} (** * CPU caps are autodetected now, those flags * are only provided for API compatibility. @@ -165,7 +165,7 @@ const SWS_CPU_CAPS_ALTIVEC = $10000000; SWS_CPU_CAPS_BFIN = $01000000; SWS_CPU_CAPS_SSE2 = $02000000; -{$ENDIF} +{$IFEND} SWS_MAX_REDUCE_CUTOFF = 0.002; @@ -249,7 +249,7 @@ function sws_init_context(sws_context: PSwsContext; srcFilter: PSwsFilter; dstFi procedure sws_freeContext(swsContext: PSwsContext); cdecl; external sw__scale; -{$IFDEF FF_API_SWS_GETCONTEXT} +{$IF FF_API_SWS_GETCONTEXT} (** * Allocate and return a SwsContext. You need it to perform * scaling/conversion operations using sws_scale(). @@ -271,7 +271,7 @@ function sws_getContext(srcW: cint; srcH: cint; srcFormat: TAVPixelFormat; flags: cint; srcFilter: PSwsFilter; dstFilter: PSwsFilter; param: PCdouble): PSwsContext; cdecl; external sw__scale; -{$ENDIF} +{$IFEND} (** * Scale the image slice in srcSlice and put the resulting scaled |