From 9c836b13bb4277de91bee191e10e18e1c95953d8 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Fri, 13 Jul 2012 17:05:41 +0000 Subject: fixed revision numbers, macros, ... git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2917 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg-0.8/swscale.pas | 44 +++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/lib/ffmpeg-0.8/swscale.pas') diff --git a/src/lib/ffmpeg-0.8/swscale.pas b/src/lib/ffmpeg-0.8/swscale.pas index f9f53d8c..b32cdeda 100644 --- a/src/lib/ffmpeg-0.8/swscale.pas +++ b/src/lib/ffmpeg-0.8/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 @@ -98,7 +98,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} @@ -150,7 +150,7 @@ const SWS_ACCURATE_RND = $40000; SWS_BITEXACT = $80000; -{$if FF_API_SWS_CPU_CAPS} +{$IF FF_API_SWS_CPU_CAPS} (** * CPU caps are autodetected now, those flags * are only provided for API compatibility. @@ -160,7 +160,7 @@ const SWS_CPU_CAPS_3DNOW = $40000000; SWS_CPU_CAPS_ALTIVEC = $10000000; SWS_CPU_CAPS_BFIN = $01000000; -{$endif} +{$IFEND} SWS_MAX_REDUCE_CUTOFF = 0.002; @@ -244,7 +244,7 @@ function sws_init_context(sws_context: PSwsContext; srcFilter: PSwsFilter; dstFi procedure sws_freeContext(swsContext: PSwsContext); cdecl; external sw__scale; -{$if FF_API_SWS_GETCONTEXT} +{$IF FF_API_SWS_GETCONTEXT} (** * Allocates and returns a SwsContext. You need it to perform * scaling/conversion operations using sws_scale(). @@ -260,10 +260,10 @@ procedure sws_freeContext(swsContext: PSwsContext); *) function sws_getContext(srcW: cint; srcH: cint; srcFormat: TAVPixelFormat; dstW: cint; dstH: cint; dstFormat: TAVPixelFormat; - flags: cint; srcFilter: PSwsFilter; - dstFilter: PSwsFilter; param: PCdouble): PSwsContext; + flags: cint; srcFilter: PSwsFilter; + dstFilter: PSwsFilter; param: PCdouble): PSwsContext; cdecl; external sw__scale; -{$endif} +{$IFEND} (** * Scales the image slice in srcSlice and puts the resulting scaled @@ -301,7 +301,7 @@ function sws_scale(context: PSwsContext; {const} srcSlice: PPCuint8Array; {const *) function sws_scale_ordered(context: PSwsContext; {const} src: PPCuint8Array; srcStride: PCintArray; srcSliceY: cint; srcSliceH: cint; - dst: PPCuint8Array; dstStride: PCintArray): cint; + dst: PPCuint8Array; dstStride: PCintArray): cint; cdecl; external sw__scale; deprecated; {$ifend} @@ -395,7 +395,7 @@ procedure sws_printVec(a: PSwsVector); *) procedure sws_printVec2(a: PSwsVector; log_ctx: PAVClass; // PAVClass is declared in avcodec.pas - log_level: cint); + log_level: cint); cdecl; external sw__scale; procedure sws_freeVec(a: PSwsVector); @@ -403,8 +403,8 @@ procedure sws_freeVec(a: PSwsVector); function sws_getDefaultFilter(lumaGBlur: cfloat; chromaGBlur: cfloat; lumaSharpen: cfloat; chromaSharpen: cfloat; - chromaHShift: cfloat; chromaVShift: cfloat; - verbose: cint): PSwsFilter; + chromaHShift: cfloat; chromaVShift: cfloat; + verbose: cint): PSwsFilter; cdecl; external sw__scale; procedure sws_freeFilter(filter: PSwsFilter); @@ -426,8 +426,8 @@ procedure sws_freeFilter(filter: PSwsFilter); function sws_getCachedContext(context: PSwsContext; srcW: cint; srcH: cint; srcFormat: TAVPixelFormat; dstW: cint; dstH: cint; dstFormat: TAVPixelFormat; - flags: cint; srcFilter: PSwsFilter; - dstFilter: PSwsFilter; param: PCdouble): PSwsContext; + flags: cint; srcFilter: PSwsFilter; + dstFilter: PSwsFilter; param: PCdouble): PSwsContext; cdecl; external sw__scale; (** @@ -440,10 +440,10 @@ function sws_getCachedContext(context: PSwsContext; * @param num_pixels number of pixels to convert * @param palette array with [256] entries, which must match color arrangement (RGB or BGR) of src *) -procedure sws_convertPalette8ToPacked32({const} src: PPCuint8Array; - dst: PPCuint8Array; - num_pixels: cint; - {const} palette: PPCuint8Array); +procedure sws_convertPalette8ToPacked32({const} src: PPCuint8Array; + dst: PPCuint8Array; + num_pixels: cint; + {const} palette: PPCuint8Array); cdecl; external sw__scale; (** @@ -456,10 +456,10 @@ procedure sws_convertPalette8ToPacked32({const} src: PPCuint8Array; * @param num_pixels number of pixels to convert * @param palette array with [256] entries, which must match color arrangement (RGB or BGR) of src *) -procedure sws_convertPalette8ToPacked24({const} src: PPCuint8Array; - dst: PPCuint8Array; - num_pixels: cint; - {const} palette: PPCuint8Array); +procedure sws_convertPalette8ToPacked24({const} src: PPCuint8Array; + dst: PPCuint8Array; + num_pixels: cint; + {const} palette: PPCuint8Array); cdecl; external sw__scale; implementation -- cgit v1.2.3