From cffe33baf336287778e3bbe1585ae087b0b0f6e0 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Tue, 11 May 2010 17:30:21 +0000 Subject: avformat and avio.pas to 52.62.0 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2352 b956fd51-792f-4845-bead-9b4dfca2ff2c --- src/lib/ffmpeg/avformat.pas | 24 ++++++++++++++++++------ src/lib/ffmpeg/avio.pas | 2 +- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/src/lib/ffmpeg/avformat.pas b/src/lib/ffmpeg/avformat.pas index d5804b31..76990479 100644 --- a/src/lib/ffmpeg/avformat.pas +++ b/src/lib/ffmpeg/avformat.pas @@ -26,12 +26,8 @@ (* * Conversion of libavformat/avformat.h - * Min. version: 50.5.0 , revision 6577, Sat Oct 7 15:30:46 2006 UTC - * Max. version: 52.25.0, revision 16986, Wed Feb 4 05:56:39 2009 UTC - * - * update to - * Max. version: 52.61.0, Sun Apr 25 2010 0:40:00 CET - * MiSchi + * Min. version: 50.5.0 , revision 6577, Sat Oct 7 15:30:46 2006 UTC + * Max. version: 52.62.0, revision 23004, Tue May 11 19:29:00 2010 CET *) unit avformat; @@ -1288,6 +1284,22 @@ function av_find_input_format(short_name: PAnsiChar): PAVInputFormat; function av_probe_input_format(pd: PAVProbeData; is_opened: cint): PAVInputFormat; cdecl; external av__format; +{$IF LIBAVFORMAT_VERSION >= 52062000} // 52.62.0 +(** + * Guesses the file format. + * + * @param is_opened Whether the file is already opened; determines whether + * demuxers with or without AVFMT_NOFILE are probed. + * @param score_max A probe score larger that this is required to accept a + * detection, the variable is set to the actual detection + * score afterwards. + * If the score is <= AVPROBE_SCORE_MAX / 4 it is recommended + * to retry with a larger probe buffer. + *) +function av_probe_input_format2(pd: PAVProbeData; is_opened: cint; score_max: PCint): PAVInputFormat; + cdecl; external av__format; +{$IFEND} + (** * Allocates all the structures needed to read an input stream. * This does not open the needed codecs for decoding the stream[s]. diff --git a/src/lib/ffmpeg/avio.pas b/src/lib/ffmpeg/avio.pas index 6d1a44f0..4863ee39 100644 --- a/src/lib/ffmpeg/avio.pas +++ b/src/lib/ffmpeg/avio.pas @@ -32,7 +32,7 @@ * header, so it should not be directly included in your projects. * * update to - * Max. avformat version: 52.61.0, revision 22921, Tue May 11 2010 19:12 CET + * Max. avformat version: 52.62.0, revision 23004, Tue May 11 19:29:00 2010 CET *) unit avio; -- cgit v1.2.3