aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-05-11 20:50:31 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-05-11 20:50:31 +0000
commit3db75f59e91a3e556b7beb3ddfae9bdac69992fc (patch)
tree10da645d7030087d1b38bdfd9d00f0903022ef91 /src/lib
parent0a10e0be5f8dc24b3bd049d763f50e8707d06364 (diff)
downloadusdx-3db75f59e91a3e556b7beb3ddfae9bdac69992fc.tar.gz
usdx-3db75f59e91a3e556b7beb3ddfae9bdac69992fc.tar.xz
usdx-3db75f59e91a3e556b7beb3ddfae9bdac69992fc.zip
update to avutil 50.12.0
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2357 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/lib/ffmpeg/avcodec.pas8
-rw-r--r--src/lib/ffmpeg/avutil.pas6
2 files changed, 11 insertions, 3 deletions
diff --git a/src/lib/ffmpeg/avcodec.pas b/src/lib/ffmpeg/avcodec.pas
index 8d490d6e..8e297360 100644
--- a/src/lib/ffmpeg/avcodec.pas
+++ b/src/lib/ffmpeg/avcodec.pas
@@ -29,6 +29,8 @@
* Min. version: 51.16.0, revision 6577, Sat Oct 7 15:30:46 2006 UTC
* Max. version: 52.67.0, revision 23057, Tue May 11 18:30 2010 CET
*
+ * Also check libavutil/error.h
+ *
*)
unit avcodec;
@@ -4673,6 +4675,12 @@ const
AVERROR_SIGN = 1;
{$IFEND}
+{
+ The following error codes are moved to libavutil/error.h on
+ revision 22501 Mar 13 2010
+ It is kept here for now.
+}
+
(*
#if EINVAL > 0
#define AVERROR(e) (-(e)) {**< Returns a negative error code from a POSIX error code, to return from library functions. *}
diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 07412d80..975aaa36 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -28,8 +28,8 @@
* Conversions of
*
* libavutil/avutil.h:
- * Min. version: 49.0.1, revision 6577, Sat Oct 7 15:30:46 2006 UTC
- * Max. version: 50.9.0, revision 16912, Tue May 11 22:05:00 2010 CET
+ * Min. version: 49.0.1, revision 6577, Sat Oct 7 15:30:46 2006 UTC
+ * Max. version: 50.12.0, revision 22501, Tue May 11 22:05:00 2010 CET
*
* libavutil/mem.h:
* revision 16590, Tue Jan 13 23:44:16 2009 UTC
@@ -93,7 +93,7 @@ const
*)
(* Max. supported version by this header *)
LIBAVUTIL_MAX_VERSION_MAJOR = 50;
- LIBAVUTIL_MAX_VERSION_MINOR = 9;
+ LIBAVUTIL_MAX_VERSION_MINOR = 12;
LIBAVUTIL_MAX_VERSION_RELEASE = 0;
LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +