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.7/avcodec.pas | 8 ++++---- src/lib/ffmpeg-0.7/avformat.pas | 18 +++++++++--------- src/lib/ffmpeg-0.7/avio.pas | 38 +++++++++++++++++++++++++++----------- src/lib/ffmpeg-0.7/avutil.pas | 15 ++++++++++----- src/lib/ffmpeg-0.7/swscale.pas | 38 +++++++++++++++++++------------------- 5 files changed, 69 insertions(+), 48 deletions(-) (limited to 'src/lib/ffmpeg-0.7') diff --git a/src/lib/ffmpeg-0.7/avcodec.pas b/src/lib/ffmpeg-0.7/avcodec.pas index 307c3ae2..159c9b58 100644 --- a/src/lib/ffmpeg-0.7/avcodec.pas +++ b/src/lib/ffmpeg-0.7/avcodec.pas @@ -80,7 +80,7 @@ const *) (* Supported version by this header *) LIBAVCODEC_MAX_VERSION_MAJOR = 52; - LIBAVCODEC_MAX_VERSION_MINOR = 122; + LIBAVCODEC_MAX_VERSION_MINOR = 123; LIBAVCODEC_MAX_VERSION_RELEASE = 0; LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) + (LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) + @@ -96,12 +96,12 @@ const (* Check if linked versions are supported *) {$IF (LIBAVCODEC_VERSION < LIBAVCODEC_MIN_VERSION)} -// {$MESSAGE Error 'Linked version of libavcodec is too old!'} + {$MESSAGE Error 'Linked version of libavcodec is too old!'} {$IFEND} (* Check if linked version is supported *) {$IF (LIBAVCODEC_VERSION > LIBAVCODEC_MAX_VERSION)} -// {$MESSAGE Error 'Linked version of libavcodec is not yet supported!'} + {$MESSAGE Error 'Linked version of libavcodec is not yet supported!'} {$IFEND} (** @@ -175,7 +175,7 @@ const {$IF FF_API_OLD_AUDIOCONVERT} {$I libavcodec/audioconvert.pas} -{$ENDIF} +{$IFEND} type FF_INTERNALC_MEM_TYPE = cuint; diff --git a/src/lib/ffmpeg-0.7/avformat.pas b/src/lib/ffmpeg-0.7/avformat.pas index 99af7410..848f1672 100644 --- a/src/lib/ffmpeg-0.7/avformat.pas +++ b/src/lib/ffmpeg-0.7/avformat.pas @@ -83,7 +83,7 @@ const (* Check if linked versions are supported *) {$IF (LIBAVFORMAT_VERSION > LIBAVFORMAT_MAX_VERSION)} -// {$MESSAGE Error 'Linked version of libavformat is not yet supported!'} + {$MESSAGE Error 'Linked version of libavformat is not yet supported!'} {$IFEND} { @@ -223,7 +223,7 @@ function av_metadata_get(m: PAVDictionary; key: {const} PAnsiChar; *) function av_metadata_set(var pm: PAVMetadata; key: {const} PAnsiChar; value: {const} PAnsiChar): cint; cdecl; external av__format; deprecated; -{$ENDIF} +{$IFEND} (** * Set the given tag in *pm, overwriting an existing tag. @@ -255,7 +255,7 @@ procedure av_metadata_copy(var dst: PAVDictionary; src: PAVDictionary; flags: ci procedure av_metadata_free(var m: PAVDictionary); cdecl; external av__format; deprecated; -{$ENDIF} +{$IFEND} (* packet functions *) @@ -434,7 +434,7 @@ type start, end_: cint64; ///< chapter start/end time in time_base units {$IF FF_API_OLD_METADATA} title: PAnsiChar; ///< chapter title -{$ENDIF} +{$IFEND} metadata: PAVDictionary; end; @@ -711,7 +711,7 @@ type {$IF FF_API_OLD_METADATA} language: array [0..3] of PAnsiChar; (**< ISO 639-2/B 3-letter language code (empty string if undefined) *) -{$ENDIF} +{$IFEND} (* av_read_frame() support *) need_parsing: TAVStreamParseType; @@ -731,7 +731,7 @@ type unused: array [0..4] of cint64; {$IF FF_API_OLD_METADATA} filename: PAnsiChar; (**< source filename of the stream *) -{$ENDIF} +{$IFEND} disposition: cint; (**< AV_DISPOSITION_* bitfield *) probe_data: TAVProbeData; @@ -833,7 +833,7 @@ type streams: array [0..MAX_STREAMS - 1] of PAVStream; {$ELSE} streams: PPAVStream; -{$ENDIF} +{$IFEND} filename: array [0..1023] of AnsiChar; (* input or output filename *) (* stream info *) timestamp: cint64; @@ -846,7 +846,7 @@ type year: cint; (**< ID3 year, 0 if none *) track: cint; (**< track number, 0 if none *) genre: array [0..31] of AnsiChar; (**< ID3 genre *) -{$ENDIF} +{$IFEND} ctx_flags: cint; (**< Format-specific flags, see AVFMTCTX_xx *) (* private data for pts handling (do not modify directly). *) @@ -1005,7 +1005,7 @@ type {$IF FF_API_OLD_METADATA} provider_name : PAnsiChar; ///< network name for DVB streams name : PAnsiChar; ///< service name for DVB streams -{$ENDIF} +{$IFEND} flags : cint; discard : TAVDiscard; ///< selects which program to discard and which to feed to the caller stream_index : PCardinal; diff --git a/src/lib/ffmpeg-0.7/avio.pas b/src/lib/ffmpeg-0.7/avio.pas index ad3c8c80..7cd31a3d 100644 --- a/src/lib/ffmpeg-0.7/avio.pas +++ b/src/lib/ffmpeg-0.7/avio.pas @@ -130,7 +130,7 @@ type write_flag: cint; (**< true if open for writing *) {$IF FF_API_OLD_AVIO} is_streamed: cint; { deprecated } -{$ENDIF} +{$IFEND} max_packet_size: cint; checksum: culong; checksum_ptr: PByteArray; @@ -171,7 +171,7 @@ type TURLContext = record {$IF FF_API_URL_CLASS} av_class: {const} PAVClass; ///< information for av_log(). Set by url_open(). -{$ENDIF} +{$IFEND} prot: PURLProtocol; flags: cint; is_streamed: cint; (**< true if streamed (no seek possible), default = false *) @@ -488,7 +488,7 @@ function url_close_buf(s: PAVIOContext): cint; *) function url_exist(url: {const} PAnsiChar): cint; cdecl; external av__format; deprecated; -{$ENDIF} // FF_API_OLD_AVIO +{$IFEND} // FF_API_OLD_AVIO (** * Return AVIO_* access flags corresponding to the access permissions @@ -536,7 +536,7 @@ function register_protocol(protocol: PURLProtocol): cint; *) function av_register_protocol(protocol: PURLProtocol): cint; cdecl; external av__format; deprecated; -{$ENDIF} +{$IFEND} (** * Allocate and initialize an AVIOContext for buffered I/O. It must be later @@ -738,7 +738,7 @@ function avio_get_str16be(pb: PAVIOContext; maxlen: cint; buf: PAnsiChar; buflen * to set up the buffer for writing. *) function url_resetbuf(s: PAVIOContext; flags: cint): cint; cdecl; external av__format; -{$ENDIF} +{$IFEND} (** * @defgroup open_modes URL open modes @@ -756,7 +756,7 @@ const AVIO_RDONLY = 1; (**< read-only *) AVIO_WRONLY = 2; (**< write-only *) AVIO_RDWR = 4; (**< read-write *) -{$ENDIF} +{$IFEND} (** * @ *) @@ -778,7 +778,7 @@ const AVIO_FLAG_NONBLOCK = 4; {$ELSE} AVIO_FLAG_NONBLOCK = 8; -{$ENDIF} +{$IFEND} (** * Create and initialize a AVIOContext for accessing the @@ -829,7 +829,7 @@ function avio_close_dyn_buf(s: PAVIOContext; var pbuffer: Pcuint8): cint; {$IF FF_API_UDP_GET_FILE} function udp_get_file_handle(h: PURLContext): cint; cdecl; external av__format; -{$ENDIF} +{$IFEND} (** * Iterate through names of available protocols. @@ -882,14 +882,30 @@ function url_is_streamed(s: PAVIOContext): cint; begin Result := s^.is_streamed; end; +{$IFEND} + +(** + * For SEEK_CUR on Windows + * values taken from stdio.h of C + *) +{$IFNDEF SEEK_SET} +const + SEEK_SET = 0; +{$ENDIF} + +{$IFNDEF SEEK_CUR} +const + SEEK_CUR = 1; +{$ENDIF} + +{$IFNDEF SEEK_END} +const + SEEK_END = 2; {$ENDIF} -{$IFDEF UNIX} function avio_tell(s: PAVIOContext): cint64; {$IFDEF HasInline}inline;{$ENDIF} begin Result := avio_seek(s, 0, SEEK_CUR); end; -{$ELSE} -{$ENDIF} end. diff --git a/src/lib/ffmpeg-0.7/avutil.pas b/src/lib/ffmpeg-0.7/avutil.pas index 3e6f5bcc..7d8ce826 100644 --- a/src/lib/ffmpeg-0.7/avutil.pas +++ b/src/lib/ffmpeg-0.7/avutil.pas @@ -98,8 +98,13 @@ const (* libavutil/common.h *) // until now MKTAG and MKBETAG is all from common.h KMS 19/5/2010 -function MKTAG (a, b, c, d: AnsiChar): integer; -function MKBETAG(a, b, c, d: AnsiChar): integer; +(** + * MKTAG and MKBETAG are usually used to convert a magic string to an enumeration index. + * In Pascal this can probably not be used and the functions could be removed. + * KMS 8/6/2012 + *) +function MKTAG (a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF} +function MKBETAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF} (** * Return the LIBAVUTIL_VERSION_INT constant. @@ -147,7 +152,7 @@ const * They may change, break or disappear at any time. *) {$IFNDEF FF_API_OLD_IMAGE_NAMES} - {$DEFINE FF_API_OLD_IMAGE_NAMES = (LIBAVUTIL_VERSION_MAJOR < 51)} + FF_API_OLD_IMAGE_NAMES = (LIBAVUTIL_VERSION_MAJOR < 51); {$ENDIF} type TAVPictureType = ( @@ -174,12 +179,12 @@ implementation (* libavutil/common.h *) -function MKTAG(a, b, c, d: AnsiChar): integer; +function MKTAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF} begin Result := (ord(a) or (ord(b) shl 8) or (ord(c) shl 16) or (ord(d) shl 24)); end; -function MKBETAG(a, b, c, d: AnsiChar): integer; +function MKBETAG(a, b, c, d: AnsiChar): integer; {$IFDEF HasInline}inline;{$ENDIF} begin Result := (ord(d) or (ord(c) shl 8) or (ord(b) shl 16) or (ord(a) shl 24)); end; diff --git a/src/lib/ffmpeg-0.7/swscale.pas b/src/lib/ffmpeg-0.7/swscale.pas index 9806fc85..688be6dd 100644 --- a/src/lib/ffmpeg-0.7/swscale.pas +++ b/src/lib/ffmpeg-0.7/swscale.pas @@ -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} @@ -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; @@ -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 @@ -299,7 +299,7 @@ function sws_scale(context: PSwsContext; {const} srcSlice: PPCuint8Array; {const // deprecated. Use sws_scale() instead. 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} @@ -393,7 +393,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); @@ -401,8 +401,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); @@ -424,8 +424,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; (** @@ -438,10 +438,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: clong; - {const} palette: PPCuint8Array); +procedure sws_convertPalette8ToPacked32({const} src: PPCuint8Array; + dst: PPCuint8Array; + num_pixels: clong; + {const} palette: PPCuint8Array); cdecl; external sw__scale; (** @@ -454,10 +454,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: clong; - {const} palette: PPCuint8Array); +procedure sws_convertPalette8ToPacked24({const} src: PPCuint8Array; + dst: PPCuint8Array; + num_pixels: clong; + {const} palette: PPCuint8Array); cdecl; external sw__scale; implementation -- cgit v1.2.3