diff options
| author | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-04-23 20:59:58 +0000 |
|---|---|---|
| committer | k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-04-23 20:59:58 +0000 |
| commit | 0b82297d34921069c89936b0b6e74a90551eaf9f (patch) | |
| tree | 2bbf512923c68af6d3766d36e2f6d4e1597384d2 | |
| parent | 708b17308a7306befb93942bc18be43b2f39496f (diff) | |
| download | usdx-0b82297d34921069c89936b0b6e74a90551eaf9f.tar.gz usdx-0b82297d34921069c89936b0b6e74a90551eaf9f.tar.xz usdx-0b82297d34921069c89936b0b6e74a90551eaf9f.zip | |
update of avcodec to 52.58
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2285 b956fd51-792f-4845-bead-9b4dfca2ff2c
| -rw-r--r-- | src/lib/ffmpeg/avcodec.pas | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/lib/ffmpeg/avcodec.pas b/src/lib/ffmpeg/avcodec.pas index 37415d49..d7685d76 100644 --- a/src/lib/ffmpeg/avcodec.pas +++ b/src/lib/ffmpeg/avcodec.pas @@ -30,7 +30,7 @@ * Max. version: 52.11.0, revision 16912, Sun Feb 1 02:00:19 2009 UTC * * update to - * Max. version: 52.56.0, Fri Apr 23 2010 21:49:00 CET + * Max. version: 52.58.0, Fri Apr 23 2010 21:49:00 CET * MiSchi *) @@ -64,7 +64,7 @@ uses const (* Max. supported version by this header *) LIBAVCODEC_MAX_VERSION_MAJOR = 52; - LIBAVCODEC_MAX_VERSION_MINOR = 56; + LIBAVCODEC_MAX_VERSION_MINOR = 58; LIBAVCODEC_MAX_VERSION_RELEASE = 0; LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) + (LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) + @@ -277,6 +277,9 @@ type CODEC_ID_IFF_ILBM, CODEC_ID_IFF_BYTERUN1, {$IFEND} +{$IF LIBAVCODEC_VERSION >= 52058000} // >= 52.58.0 + CODEC_ID_KGV1, +{$IFEND} //* various PCM "codecs" */ CODEC_ID_PCM_S16LE= $10000, @@ -549,7 +552,7 @@ const * MPEG bitstreams could cause overread and segfault. *} FF_INPUT_BUFFER_PADDING_SIZE = 8; -{$ELSE} +{$ELSEIF LIBAVCODEC_VERSION < 52058000} // < 52.58.0 {** * Required number of additionally allocated bytes at the end of the input bitstream for decoding. * The first 8 bytes are needed because some optimized bitstream readers read @@ -560,6 +563,15 @@ const * MPEG bitstreams could cause overread and segfault. *} FF_INPUT_BUFFER_PADDING_SIZE = 64; +{$ELSE} // >= 52.58.0} +{** + * Required number of additionally allocated bytes at the end of the input bitstream for decoding. + * This is mainly needed because some optimized bitstream readers read + * 32 or 64 bit at once and could read over the end.<br> + * Note: If the first 23 bits of the additional bytes are not 0, then damaged + * MPEG bitstreams could cause overread and segfault. + *} + FF_INPUT_BUFFER_PADDING_SIZE = 8; {$IFEND} {** |