aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/ffmpeg
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-04-23 20:42:50 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-04-23 20:42:50 +0000
commit708b17308a7306befb93942bc18be43b2f39496f (patch)
tree199a48145770af10f20996f1f4a582dab1c2855d /src/lib/ffmpeg
parentaa1a6259b212926e5ff2d80bd2f780cd8f81bbf6 (diff)
downloadusdx-708b17308a7306befb93942bc18be43b2f39496f.tar.gz
usdx-708b17308a7306befb93942bc18be43b2f39496f.tar.xz
usdx-708b17308a7306befb93942bc18be43b2f39496f.zip
update of avcodec to 52.56
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2284 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/lib/ffmpeg')
-rw-r--r--src/lib/ffmpeg/avcodec.pas17
1 files changed, 15 insertions, 2 deletions
diff --git a/src/lib/ffmpeg/avcodec.pas b/src/lib/ffmpeg/avcodec.pas
index df0bb2c0..37415d49 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.55.0, Fri Apr 23 2010 21:49:00 CET
+ * Max. version: 52.56.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 = 55;
+ LIBAVCODEC_MAX_VERSION_MINOR = 56;
LIBAVCODEC_MAX_VERSION_RELEASE = 0;
LIBAVCODEC_MAX_VERSION = (LIBAVCODEC_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVCODEC_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -540,6 +540,7 @@ const
{* in bytes *}
AVCODEC_MAX_AUDIO_FRAME_SIZE = 192000; // 1 second of 48khz 32bit audio
+{$IF LIBAVCODEC_VERSION <= 52056000} // <= 52.56.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
@@ -548,6 +549,18 @@ const
* MPEG bitstreams could cause overread and segfault.
*}
FF_INPUT_BUFFER_PADDING_SIZE = 8;
+{$ELSE}
+{**
+ * 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
+ * 32 or 64 bit at once and could read over the end. The remainder is to give
+ * decoders a reasonable amount of distance to work with before checking for
+ * buffer overreads.<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 = 64;
+{$IFEND}
{**
* minimum encoding buffer size.