From 5d82dc076def1f149382adc096388fe24a38e2b3 Mon Sep 17 00:00:00 2001
From: k-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Tue, 20 Jul 2010 20:56:22 +0000
Subject: update avformat to 52.74.0

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2590 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/lib/ffmpeg/avformat.pas | 4 ++--
 src/lib/ffmpeg/avio.pas     | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/ffmpeg/avformat.pas b/src/lib/ffmpeg/avformat.pas
index 9f7f5448..74a0fd8d 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.73.0, revision 24007, Tue Jul 20 21:30:00 2010 CET 
+ * Max. version: 52.74.0, revision 24278, 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   = 73;
+  LIBAVFORMAT_MAX_VERSION_MINOR   = 74;
   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 0a024ad5..c32b86be 100644
--- a/src/lib/ffmpeg/avio.pas
+++ b/src/lib/ffmpeg/avio.pas
@@ -488,9 +488,15 @@ function url_fseek(s: PByteIOContext; offset: cint64; whence: cint): cint64;
 (**
  * Skip given number of bytes forward.
  * @param offset number of bytes
+ * @return 0 on success, <0 on error
  *)
+{$IF LIBAVFORMAT_VERSION < 52074000} // 52.74.0
 procedure url_fskip(s: PByteIOContext; offset: cint64);
   cdecl; external av__format;
+{$ELSE}
+function url_fskip(s: PByteIOContext; offset: cint64): cint;
+  cdecl; external av__format;
+{$IFEND}
 
 (**
  * ftell() equivalent for ByteIOContext.
-- 
cgit v1.2.3