aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-07-20 19:03:41 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-07-20 19:03:41 +0000
commiteb4e04eeb81f4821c0cdcf909113a49d081ff19e (patch)
tree9b0267c324218cd898c9abdb548f8b05077e0d60
parent8ba7eab8d58733b17e41d03ac237e7ff813ff4b0 (diff)
downloadusdx-eb4e04eeb81f4821c0cdcf909113a49d081ff19e.tar.gz
usdx-eb4e04eeb81f4821c0cdcf909113a49d081ff19e.tar.xz
usdx-eb4e04eeb81f4821c0cdcf909113a49d081ff19e.zip
update avformat to 52.69.0
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2585 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to '')
-rw-r--r--src/lib/ffmpeg/avformat.pas4
-rw-r--r--src/lib/ffmpeg/avio.pas15
2 files changed, 13 insertions, 6 deletions
diff --git a/src/lib/ffmpeg/avformat.pas b/src/lib/ffmpeg/avformat.pas
index 436ccf9b..c5ae2606 100644
--- a/src/lib/ffmpeg/avformat.pas
+++ b/src/lib/ffmpeg/avformat.pas
@@ -23,7 +23,7 @@
*
* Conversion of libavformat/avformat.h
* Min. version: 50.5.0 , revision 6577, Sat Oct 7 15:30:46 2006 UTC
- * Max. version: 52.68.0, revision 23634, Tue Jul 20 21:30:00 2010 CET
+ * Max. version: 52.69.0, revision 23702, Tue Jul 20 21:30:00 2010 CET
*)
unit avformat;
@@ -81,7 +81,7 @@ const
*)
(* Max. supported version by this header *)
LIBAVFORMAT_MAX_VERSION_MAJOR = 52;
- LIBAVFORMAT_MAX_VERSION_MINOR = 68;
+ LIBAVFORMAT_MAX_VERSION_MINOR = 69;
LIBAVFORMAT_MAX_VERSION_RELEASE = 0;
LIBAVFORMAT_MAX_VERSION = (LIBAVFORMAT_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVFORMAT_MAX_VERSION_MINOR * VERSION_MINOR) +
diff --git a/src/lib/ffmpeg/avio.pas b/src/lib/ffmpeg/avio.pas
index 1965e037..12e9847f 100644
--- a/src/lib/ffmpeg/avio.pas
+++ b/src/lib/ffmpeg/avio.pas
@@ -137,7 +137,7 @@ type
* unnecessary, if the return value is < size then it is
* certain there was either an error or the end of file was reached.
*)
- url_write: function (h: PURLContext; buf: PByteArray; size: cint): cint; cdecl;
+ url_write: function (h: PURLContext; {const} buf: PByteArray; size: cint): cint; cdecl;
(**
* Changes the position that will be used by the next read/write
@@ -378,19 +378,26 @@ function av_protocol_next(p: PURLProtocol): PURLProtocol;
{$IF LIBAVFORMAT_VERSION <= 52028000} // 52.28.0
(**
* Registers the URLProtocol protocol.
- *)
-(**
+ *
+ *
* @deprecated Use av_register_protocol() instead.
*)
function register_protocol(protocol: PURLProtocol): cint;
cdecl; external av__format;
-(** Alias for register_protocol() *)
+(** Alias for register_protocol()
+ *
+ * @deprecated Use av_register_protocol2() instead.
+ *)
function av_register_protocol(protocol: PURLProtocol): cint;
cdecl; external av__format name 'register_protocol';
{$ELSE}
function av_register_protocol(protocol: PURLProtocol): cint;
cdecl; external av__format;
{$IFEND}
+{$IF LIBAVFORMAT_VERSION >= 52069000} // 52.69.0
+{$IFEND}
+function av_register_protocol2(protocol: PURLProtocol; size: cint): cint;
+ cdecl; external av__format;
type
TReadWriteFunc = function(opaque: Pointer; buf: PByteArray; buf_size: cint): cint; cdecl;