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.9/avcodec.pas | 40 ++++++++++++++++++++-------------------- src/lib/ffmpeg-0.9/avformat.pas | 8 ++++---- src/lib/ffmpeg-0.9/avio.pas | 12 ++++++------ src/lib/ffmpeg-0.9/avutil.pas | 4 ++-- src/lib/ffmpeg-0.9/swscale.pas | 8 ++++---- 5 files changed, 36 insertions(+), 36 deletions(-) (limited to 'src/lib/ffmpeg-0.9') diff --git a/src/lib/ffmpeg-0.9/avcodec.pas b/src/lib/ffmpeg-0.9/avcodec.pas index 1d96e6fa..35ea05f8 100644 --- a/src/lib/ffmpeg-0.9/avcodec.pas +++ b/src/lib/ffmpeg-0.9/avcodec.pas @@ -22,7 +22,7 @@ * - Changes and updates by the UltraStar Deluxe Team * * Conversion of libavcodec/avcodec.h - * version: 52.122.0 + * version: 53.42.0 - 53.42.4 * *) @@ -79,16 +79,16 @@ const * fix. *) (* Supported version by this header *) - LIBAVCODEC_MAX_VERSION_MAJOR = 52; - LIBAVCODEC_MAX_VERSION_MINOR = 122; - LIBAVCODEC_MAX_VERSION_RELEASE = 0; + LIBAVCODEC_MAX_VERSION_MAJOR = 53; + LIBAVCODEC_MAX_VERSION_MINOR = 42; + LIBAVCODEC_MAX_VERSION_RELEASE = 4; LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) + (LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) + (LIBAVCODEC_MAX_VERSION_RELEASE * VERSION_RELEASE); (* Min. supported version by this header *) - LIBAVCODEC_MIN_VERSION_MAJOR = 52; - LIBAVCODEC_MIN_VERSION_MINOR = 122; + LIBAVCODEC_MIN_VERSION_MAJOR = 53; + LIBAVCODEC_MIN_VERSION_MINOR = 42; LIBAVCODEC_MIN_VERSION_RELEASE = 0; LIBAVCODEC_MIN_VERSION = (LIBAVCODEC_MIN_VERSION_MAJOR * VERSION_MAJOR) + (LIBAVCODEC_MIN_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} const AV_NOPTS_VALUE: cint64 = $8000000000000000; @@ -301,7 +301,7 @@ type CODEC_ID_GIF, {$IF LIBAVCODEC_VERSION_MAJOR = 53} CODEC_ID_FFH264, -{$ENDIF} +{$IFEND} CODEC_ID_DXA, CODEC_ID_DNXHD, CODEC_ID_THP, @@ -322,7 +322,7 @@ type {$IF LIBAVCODEC_VERSION_MAJOR = 53} CODEC_ID_8SVX_EXP, CODEC_ID_8SVX_FIB, -{$ENDIF} +{$IFEND} CODEC_ID_ESCAPE124, CODEC_ID_DIRAC, CODEC_ID_BFI, @@ -364,7 +364,7 @@ type {$IF LIBAVCODEC_VERSION_MAJOR = 53} CODEC_ID_G723_1_DEPRECATED, CODEC_ID_G729_DEPRECATED, -{$ENDIF} +{$IFEND} CODEC_ID_UTVIDEO_DEPRECATED, CODEC_ID_BMV_VIDEO, CODEC_ID_VBLE, @@ -465,7 +465,7 @@ type {$IF LIBAVCODEC_VERSION_MAJOR = 53} CODEC_ID_SONIC, CODEC_ID_SONIC_LS, -{$ENDIF} +{$IFEND} CODEC_ID_FLAC, CODEC_ID_MP3ADU, CODEC_ID_MP3ON4, @@ -512,7 +512,7 @@ type CODEC_ID_G729_DEPRECATED, CODEC_ID_8SVX_EXP, CODEC_ID_8SVX_FIB, -{$ENDIF} +{$IFEND} CODEC_ID_BMV_AUDIO, CODEC_ID_G729 = $15800, CODEC_ID_G723_1= $15801, @@ -556,7 +556,7 @@ type ); -{$IFDEF FF_API_OLD_SAMPLE_FMT} +{$IF FF_API_OLD_SAMPLE_FMT} type TSampleFormat = TAVSampleFormat; @@ -568,9 +568,9 @@ const SAMPLE_FMT_FLT = AV_SAMPLE_FMT_FLT; SAMPLE_FMT_DBL = AV_SAMPLE_FMT_DBL; SAMPLE_FMT_NB = AV_SAMPLE_FMT_NB; -{$ENDIF} +{$IFEND} -{$IFDEF FF_API_OLD_AUDIOCONVERT} +{$IF FF_API_OLD_AUDIOCONVERT} const {* Audio channel masks *} @@ -617,7 +617,7 @@ const CH_LAYOUT_7POINT1 = AV_CH_LAYOUT_7POINT1; CH_LAYOUT_7POINT1_WIDE = AV_CH_LAYOUT_7POINT1_WIDE; CH_LAYOUT_STEREO_DOWNMIX = AV_CH_LAYOUT_STEREO_DOWNMIX; -{$ENDIF} +{$IFEND} {$IFDEF FF_API_OLD_DECODE_AUDIO} {* in bytes *} @@ -723,7 +723,7 @@ type AVCHROMA_LOC_NB ///< Not part of ABI ); -{$IFDEF FF_API_FLAC_GLOBAL_OPTS} +{$IF FF_API_FLAC_GLOBAL_OPTS} (** * LPC analysis type *) @@ -735,7 +735,7 @@ type AV_LPC_TYPE_CHOLESKY = 3, ///< Cholesky factorization AV_LPC_TYPE_NB ///< Not part of ABI ); -{$ENDIF} +{$IFEND} TAVAudioServiceType =( AV_AUDIO_SERVICE_TYPE_MAIN = 0, diff --git a/src/lib/ffmpeg-0.9/avformat.pas b/src/lib/ffmpeg-0.9/avformat.pas index 499361d1..7d8b4f15 100644 --- a/src/lib/ffmpeg-0.9/avformat.pas +++ b/src/lib/ffmpeg-0.9/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} { @@ -240,7 +240,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 *) @@ -492,7 +492,7 @@ type {$IF FF_API_OLD_METADATA2} {const} metadata_conv: PAVMetadataConv; -{$ENDIF} +{$IFEND} {const} priv_class: PAVClass; ///< AVClass for the private context @@ -580,7 +580,7 @@ type *) read_seek: function (c: PAVFormatContext; stream_index: cint; timestamp: cint64; flags: cint): cint; cdecl; deprecated; -{$ENDIF} +{$IFEND} (** * Gets the next timestamp in stream[stream_index].time_base units. diff --git a/src/lib/ffmpeg-0.9/avio.pas b/src/lib/ffmpeg-0.9/avio.pas index 946f104b..b913d72f 100644 --- a/src/lib/ffmpeg-0.9/avio.pas +++ b/src/lib/ffmpeg-0.9/avio.pas @@ -130,7 +130,7 @@ type *) PAVIOContext = ^TAVIOContext; TAVIOContext = record -{$IFNDEF FF_API_OLD_AVIO} +{$IF FF_API_OLD_AVIO} (** * A class for private options. * @@ -144,7 +144,7 @@ type * to any av_opt_* functions in that case. *) av_class: PAVClass; -{$ENDIF} +{$IFEND} buffer: PByteArray; (**< Start of the buffer. *) buffer_size: cint; (**< Maximum buffer size *) buf_ptr: PByteArray; (**< Current position in the buffer *) @@ -163,7 +163,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; @@ -522,7 +522,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_FLAG_* access flags corresponding to the access permissions @@ -540,7 +540,7 @@ function url_exist(url: {const} PAnsiChar): cint; function avio_check(url: {const} PAnsiChar; flags: cint): cint; cdecl; external av__format; -{$IFDEF FF_API_OLD_INTERRUPT_CB} +{$IF FF_API_OLD_INTERRUPT_CB} (** * The callback is called in blocking functions to test regulary if * asynchronous interruption is needed. AVERROR_EXIT is returned @@ -894,7 +894,7 @@ function url_is_streamed(s: PAVIOContext): cint; begin Result := s^.is_streamed; end; -{$ENDIF} +{$IFEND} (** * For SEEK_CUR on Windows diff --git a/src/lib/ffmpeg-0.9/avutil.pas b/src/lib/ffmpeg-0.9/avutil.pas index d9c98726..9a2ef4ed 100644 --- a/src/lib/ffmpeg-0.9/avutil.pas +++ b/src/lib/ffmpeg-0.9/avutil.pas @@ -71,11 +71,11 @@ const (* Check if linked versions are supported *) {$IF (LIBAVUTIL_VERSION < LIBAVUTIL_MIN_VERSION)} -// {$MESSAGE Error 'Linked version of libavutil is too old!'} + {$MESSAGE Error 'Linked version of libavutil is too old!'} {$IFEND} {$IF (LIBAVUTIL_VERSION > LIBAVUTIL_MAX_VERSION)} -// {$MESSAGE Error 'Linked version of libavutil is not yet supported!'} + {$MESSAGE Error 'Linked version of libavutil is not yet supported!'} {$IFEND} (** diff --git a/src/lib/ffmpeg-0.9/swscale.pas b/src/lib/ffmpeg-0.9/swscale.pas index fd5dc180..c26f66c5 100644 --- a/src/lib/ffmpeg-0.9/swscale.pas +++ b/src/lib/ffmpeg-0.9/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} @@ -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; @@ -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} (** * Scales the image slice in srcSlice and puts the resulting scaled -- cgit v1.2.3