aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-05-11 22:00:32 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-05-11 22:00:32 +0000
commit1cdbe92fe6af0604e976e469dea881fb7e7985ed (patch)
tree7ef535dd079a0e7435fa9ad4f8f07054ec19ea1c
parent899bcfea71b94360022cc876a02858253119b6b2 (diff)
downloadusdx-1cdbe92fe6af0604e976e469dea881fb7e7985ed.tar.gz
usdx-1cdbe92fe6af0604e976e469dea881fb7e7985ed.tar.xz
usdx-1cdbe92fe6af0604e976e469dea881fb7e7985ed.zip
update to avutil 50.15.0
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2361 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/lib/ffmpeg/avcodec.pas9
-rw-r--r--src/lib/ffmpeg/avutil.pas4
2 files changed, 11 insertions, 2 deletions
diff --git a/src/lib/ffmpeg/avcodec.pas b/src/lib/ffmpeg/avcodec.pas
index db861790..f1d7fdd3 100644
--- a/src/lib/ffmpeg/avcodec.pas
+++ b/src/lib/ffmpeg/avcodec.pas
@@ -1234,6 +1234,15 @@ type
of AVIn/OutputFormat *)
item_name: function(): PAnsiChar; cdecl;
option: PAVOption;
+
+{$IF LIBAVUTIL_VERSION >= 50015000} // 50.15.0
+{$IFEND}
+ (**
+ * LIBAVUTIL_VERSION with which this structure was created.
+ * This is used to allow fields to be added without requireing major
+ * version bumps everywhere.
+ *)
+ version: cint;
end;
{**
diff --git a/src/lib/ffmpeg/avutil.pas b/src/lib/ffmpeg/avutil.pas
index 67208837..439e6ac2 100644
--- a/src/lib/ffmpeg/avutil.pas
+++ b/src/lib/ffmpeg/avutil.pas
@@ -29,7 +29,7 @@
*
* libavutil/avutil.h:
* Min. version: 49.0.1, revision 6577, Sat Oct 7 15:30:46 2006 UTC
- * Max. version: 50.14.0, revision 22736, Tue May 11 22:05:00 2010 CET
+ * Max. version: 50.15.0, revision 22987, 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 = 14;
+ LIBAVUTIL_MAX_VERSION_MINOR = 15;
LIBAVUTIL_MAX_VERSION_RELEASE = 0;
LIBAVUTIL_MAX_VERSION = (LIBAVUTIL_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVUTIL_MAX_VERSION_MINOR * VERSION_MINOR) +