aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authork-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-05-15 20:59:11 +0000
committerk-m_schindler <k-m_schindler@b956fd51-792f-4845-bead-9b4dfca2ff2c>2013-05-15 20:59:11 +0000
commit48b8be5a61620c84dcbeca0625523ac490f37093 (patch)
tree2ea374e4ac42fb1e6ebb3183421ca7bd7876d519
parentf866ddce120b62c5101acac09a5ce86c1e40a2d7 (diff)
downloadusdx-48b8be5a61620c84dcbeca0625523ac490f37093.tar.gz
usdx-48b8be5a61620c84dcbeca0625523ac490f37093.tar.xz
usdx-48b8be5a61620c84dcbeca0625523ac490f37093.zip
fix compilation on ubuntu and lart release engineers, who mix releases ;-)
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2984 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--src/lib/ffmpeg-0.8/avformat.pas4
-rw-r--r--src/media/UAudioDecoder_FFmpeg.pas2
-rw-r--r--src/media/UVideo.pas2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/ffmpeg-0.8/avformat.pas b/src/lib/ffmpeg-0.8/avformat.pas
index 1127c50a..75ea31d0 100644
--- a/src/lib/ffmpeg-0.8/avformat.pas
+++ b/src/lib/ffmpeg-0.8/avformat.pas
@@ -23,7 +23,7 @@
*
* Conversion of version 0.8 libavformat/avformat.h
* Min. version: 53.4.0
- * Max. version: 53.21.0
+ * Max. version: 53.21.1
*)
unit avformat;
@@ -63,7 +63,7 @@ const
(* Max. supported version by this header *)
LIBAVFORMAT_MAX_VERSION_MAJOR = 53;
LIBAVFORMAT_MAX_VERSION_MINOR = 21;
- LIBAVFORMAT_MAX_VERSION_RELEASE = 0;
+ LIBAVFORMAT_MAX_VERSION_RELEASE = 1;
LIBAVFORMAT_MAX_VERSION = (LIBAVFORMAT_MAX_VERSION_MAJOR * VERSION_MAJOR) +
(LIBAVFORMAT_MAX_VERSION_MINOR * VERSION_MINOR) +
(LIBAVFORMAT_MAX_VERSION_RELEASE * VERSION_RELEASE);
diff --git a/src/media/UAudioDecoder_FFmpeg.pas b/src/media/UAudioDecoder_FFmpeg.pas
index 46ff0806..21322064 100644
--- a/src/media/UAudioDecoder_FFmpeg.pas
+++ b/src/media/UAudioDecoder_FFmpeg.pas
@@ -462,7 +462,7 @@ begin
// Close the video file
if (fFormatCtx <> nil) then
begin
- {$IF LIBAVFORMAT_VERSION >= 53017003)}
+ {$IF LIBAVFORMAT_VERSION >= 53024002)}
avformat_close_input(@fFormatCtx);
{$ELSE}
av_close_input_file(fFormatCtx);
diff --git a/src/media/UVideo.pas b/src/media/UVideo.pas
index 0fc86ac4..a4b12962 100644
--- a/src/media/UVideo.pas
+++ b/src/media/UVideo.pas
@@ -584,7 +584,7 @@ begin
end;
if (fFormatContext <> nil) then
- {$IF LIBAVFORMAT_VERSION >= 53017003)}
+ {$IF LIBAVFORMAT_VERSION >= 53024002)}
avformat_close_input(@fFormatContext);
{$ELSE}
av_close_input_file(fFormatContext);