aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-04-24 23:04:48 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2010-04-24 23:04:48 +0000
commitd48ed1b73836f77d6d35da757d73638f655aee00 (patch)
tree450ff2317c86dc78bec0dec6eb3da26f75890fdf
parentb1e0065793003a66c10794ef254a439ac90293a5 (diff)
downloadusdx-d48ed1b73836f77d6d35da757d73638f655aee00.tar.gz
usdx-d48ed1b73836f77d6d35da757d73638f655aee00.tar.xz
usdx-d48ed1b73836f77d6d35da757d73638f655aee00.zip
update to 52.60.0
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2302 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/lib/ffmpeg/avformat.pas19
1 files changed, 17 insertions, 2 deletions
diff --git a/src/lib/ffmpeg/avformat.pas b/src/lib/ffmpeg/avformat.pas
index cad4ab1b..7ffee8ab 100644
--- a/src/lib/ffmpeg/avformat.pas
+++ b/src/lib/ffmpeg/avformat.pas
@@ -30,7 +30,7 @@
* Max. version: 52.25.0, revision 16986, Wed Feb 4 05:56:39 2009 UTC
*
* update to
- * Max. version: 52.59.0, Sun Apr 25 2010 0:40:00 CET
+ * Max. version: 52.60.0, Sun Apr 25 2010 0:40:00 CET
* MiSchi
*)
@@ -64,7 +64,7 @@ uses
const
(* Max. supported version by this header *)
LIBAVFORMAT_MAX_VERSION_MAJOR = 52;
- LIBAVFORMAT_MAX_VERSION_MINOR = 59;
+ LIBAVFORMAT_MAX_VERSION_MINOR = 60;
LIBAVFORMAT_MAX_VERSION_RELEASE = 0;
LIBAVFORMAT_MAX_VERSION = (LIBAVFORMAT_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVFORMAT_MAX_VERSION_MINOR * VERSION_MINOR) +
@@ -373,6 +373,10 @@ const
{$IF LIBAVFORMAT_VERSION >= 52048000} // >= 52.48.0
AVFMT_FLAG_IGNDTS = $0008; ///< Ignore DTS on frames that contain both DTS & PTS
{$IFEND}
+{$IF LIBAVFORMAT_VERSION >= 52060000} // >= 52.60.0
+ AVFMT_FLAG_NOFILLIN = $0010; ///< Do not infer any values from other values, just return what is stored in the container
+ AVFMT_FLAG_NOPARSE = $0020; ///< Do not use AVParsers, you also must set AVFMT_FLAG_NOFILLIN as the fillin code works on frames and no parsing -> no frames. Also seeking to frames can not work if parsing to find frame boundaries has been disabled
+{$IFEND}
// used by AVStream
MAX_REORDER_DELAY = 16;
@@ -1799,6 +1803,17 @@ function avf_sdp_create(ac: PPAVFormatContext; n_files: cint; buff: PByteArray;
cdecl; external av__format;
{$IFEND}
+{$IF LIBAVFORMAT_VERSION >= 52060000} // 52.60.0
+(**
+ * Returns a positive value if the given filename has one of the given
+ * extensions, 0 otherwise.
+ *
+ * @param extensions a comma-separated list of filename extensions
+ *)
+function av_match_ext(filename: {const} Pchar; extensions: {const} Pchar): cint;
+ cdecl; external av__format;
+{$IFEND}
+
implementation
{$IF LIBAVFORMAT_VERSION < 51012002} // 51.12.2